tree c2945c5dd31885263ffcdfbb1e10694349ccc233
parent fd55874e6587156c945512d107ad21f56932c4ec
parent 20c2aec3519af09f91353213806e15e0127632f3
author Brian Foley <bpfoley@google.com> 1467889955 +0100
committer Brian Foley <bpfoley@google.com> 1467891717 +0100

Merge branch 'stable-2.16' into stable-2.17

* stable-2.16
  Fix some trivial pep8/pylint errors
  Make executeRpcCall only compute rpcCallData once
  Remove storage unit selection from rpcCallData
  Only import needed functions from Ganeti.JSON
  Special case WaitForJobChange to reduce heap use

* stable-2.15
  Cleanup more pylint/pep8/apidoc errors
  KVM: handle gracefully too old/too new psutil versions
  Fix small typo in opcode tests
  Fix line-too long errors

Manually update import lists to fix compile errors, and fix trivial
pep8 whitespace warning.

Signed-off-by: Brian Foley <bpfoley@google.com>
Reviewed-by: Viktor Bachraty <vbachraty@google.com>