Merge 'EvacNode' and 'NodeEvacMode'
authorJose A. Lopes <jabolopes@google.com>
Wed, 25 Sep 2013 13:40:14 +0000 (15:40 +0200)
committerJose A. Lopes <jabolopes@google.com>
Wed, 2 Oct 2013 12:50:28 +0000 (14:50 +0200)
commitd067f40b0b9f2aee13c5fa5daa8695f6e94a3eae
tree58c48aa36924a9c59856fa8e505d2e4129f81a10
parent6dc364f99a08c8d81555934cbf506a6c62932183
Merge 'EvacNode' and 'NodeEvacMode'

Merge 'EvacMode' and 'NodeEvacMode' which are associated with the
duplicated constants 'IALLOCATOR_NEVAC_*' and 'NODE_EVAC_*'.  This
merge moves the type 'EvacMode' to 'Ganeti.Types' in order to avoid a
circular dependency between 'Ganeti.HsConstants' and
'Ganeti.HTools.Types'.  The type 'EvacMode' is preferred to the type
'NodeEvacMode' given that its use is more widespread.

Signed-off-by: Jose A. Lopes <jabolopes@google.com>
Reviewed-by: Klaus Aehlig <aehlig@google.com>
12 files changed:
lib/ht.py
lib/masterd/iallocator.py
src/Ganeti/HTools/Backend/IAlloc.hs
src/Ganeti/HTools/Cluster.hs
src/Ganeti/HTools/Loader.hs
src/Ganeti/HTools/Types.hs
src/Ganeti/HsConstants.hs
src/Ganeti/OpParams.hs
src/Ganeti/Types.hs
test/hs/Test/Ganeti/HTools/Cluster.hs
test/hs/Test/Ganeti/HTools/Types.hs
test/hs/Test/Ganeti/Types.hs