Merge branch 'devel-2.6' into master
authorDato Simó <dato@google.com>
Wed, 17 Oct 2012 15:40:05 +0000 (16:40 +0100)
committerDato Simó <dato@google.com>
Wed, 17 Oct 2012 16:45:17 +0000 (17:45 +0100)
commit659d769de5459d709c7d6da4f585058e1a35db40
treeef74aa3ac9ad0c41293daeae7f67f83abeaee233
parent18ccdced299d07b2841d750c3aa169e4cfae81bc
parentb898de8ff00a40c1451311859ac0258b4fdea596
Merge branch 'devel-2.6' into master

* devel-2.6:
  htools-excl.test: add test case for exclusion tags in hbal
  Instance.hs: rename 'tags' to 'exclTags', provide 'allTags'
  Group.hs: add 'allTags'; adjust loaders and test data for it
  Add hbal-excl-tags.data to Makefile.am, missed in 0397694

Conflicts:
Makefile.am: hbal-excl-tags.data moved under htest/
htools/Ganeti/HTools/Luxi.hs: types from Qlang are now used
htools/Ganeti/HTools/QC.hs: defGroup definition now in TestHTools.hs
lib/cmdlib.py: IAllocator class now in iallocator.py
test/htools-excl.test: moved under htest/

Signed-off-by: Dato Simó <dato@google.com>
Reviewed-by: Iustin Pop <iustin@google.com>
20 files changed:
Makefile.am
htest/Test/Ganeti/TestHTools.hs
htest/data/common-suffix.data
htest/data/hail-alloc-drbd.json
htest/data/hail-change-group.json
htest/data/hail-node-evac.json
htest/data/hail-reloc-drbd.json
htest/data/hbal-excl-tags.data
htest/data/hbal-split-insts.data
htest/data/invalid-node.data
htest/data/missing-resources.data
htest/shelltests/htools-excl.test
htools/Ganeti/HTools/IAlloc.hs
htools/Ganeti/HTools/Instance.hs
htools/Ganeti/HTools/Loader.hs
htools/Ganeti/HTools/Luxi.hs
htools/Ganeti/HTools/Rapi.hs
htools/Ganeti/HTools/Simu.hs
htools/Ganeti/HTools/Text.hs
lib/masterd/iallocator.py