| commit | e1d136e19735f556b89d698f33177290882d104d | [log] [tgz] |
|---|---|---|
| author | Brian Foley <bpfoley@google.com> | Thu Jul 07 11:31:19 2016 +0100 |
| committer | Brian Foley <bpfoley@google.com> | Thu Jul 07 11:57:28 2016 +0100 |
| tree | 92b309217938ffcf4fda3115f577154596292af7 | |
| parent | 24da2b16a3653b151c3cf71d9c4eaebcd99b520b [diff] | |
| parent | 55ad60edf0dc770e15b6f9b432f05fba25e31f2d [diff] |
Merge branch 'stable-2.15' into stable-2.16 * stable-2.15 Cleanup more pylint/pep8/apidoc errors KVM: handle gracefully too old/too new psutil versions Manually fix up merge conflicts. Signed-off-by: Brian Foley <bpfoley@google.com> Reviewed-by: Viktor Bachraty <vbachraty@google.com>