commit 3d17266c14d6e021253844b199b9518068875e4f
Merge: b7a0dde a824a2e
Author: Brian Foley <[email protected]>
Date: Thu Jul 7 13:34:40 2016 +0100
Merge branch 'stable-2.17'
* stable-2.17
Improve missing job error handling in maintd
Prevent the watcher from submitting too many jobs
Fix hscan failing loading network field
Prevent watcher from holding lock on verify group
* 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
Signed-off-by: Brian Foley <[email protected]>
diff --cc src/Ganeti/Types.hs
index c332ba0,8da06d4..66507cc
--- a/src/Ganeti/Types.hs
+++ b/src/Ganeti/Types.hs
@@@ -200,9 -200,9 +200,9 @@@ import Data.Ratio (numerator, denominat
import System.Time (ClockTime)
import qualified Ganeti.ConstantUtils as ConstantUtils
- import Ganeti.JSON
+ import Ganeti.JSON (Container, HasStringRepr(..))
import qualified Ganeti.THH as THH
+import qualified Ganeti.THH.Field as THH (TagSet)
import Ganeti.Utils
-- * Generic types
diff --cc test/py/mocks.py
index 66b9cf1,b48125b..5c78918
--- a/test/py/mocks.py
+++ b/test/py/mocks.py
@@@ -203,7 -202,5 +206,8 @@@ class FakeLU(object)
return []
def HooksCallBack(self, phase, hook_results, feedback_fn, lu_result):
+ # pylint: disable=W0613
return lu_result
+
+ def HooksAbortCallBack(self, phase, feedback_fn, exception):
+ pass
