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 0397694e 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>
No related branches found
No related tags found
Showing
- Makefile.am 1 addition, 0 deletionsMakefile.am
- htest/Test/Ganeti/TestHTools.hs 1 addition, 1 deletionhtest/Test/Ganeti/TestHTools.hs
- htest/data/common-suffix.data 1 addition, 1 deletionhtest/data/common-suffix.data
- htest/data/hail-alloc-drbd.json 1 addition, 0 deletionshtest/data/hail-alloc-drbd.json
- htest/data/hail-change-group.json 2 additions, 0 deletionshtest/data/hail-change-group.json
- htest/data/hail-node-evac.json 1 addition, 0 deletionshtest/data/hail-node-evac.json
- htest/data/hail-reloc-drbd.json 1 addition, 0 deletionshtest/data/hail-reloc-drbd.json
- htest/data/hbal-excl-tags.data 12 additions, 0 deletionshtest/data/hbal-excl-tags.data
- htest/data/hbal-split-insts.data 2 additions, 2 deletionshtest/data/hbal-split-insts.data
- htest/data/invalid-node.data 1 addition, 1 deletionhtest/data/invalid-node.data
- htest/data/missing-resources.data 1 addition, 1 deletionhtest/data/missing-resources.data
- htest/shelltests/htools-excl.test 5 additions, 0 deletionshtest/shelltests/htools-excl.test
- htools/Ganeti/HTools/Group.hs 4 additions, 2 deletionshtools/Ganeti/HTools/Group.hs
- htools/Ganeti/HTools/IAlloc.hs 2 additions, 1 deletionhtools/Ganeti/HTools/IAlloc.hs
- htools/Ganeti/HTools/Instance.hs 4 additions, 2 deletionshtools/Ganeti/HTools/Instance.hs
- htools/Ganeti/HTools/Loader.hs 7 additions, 7 deletionshtools/Ganeti/HTools/Loader.hs
- htools/Ganeti/HTools/Luxi.hs 4 additions, 3 deletionshtools/Ganeti/HTools/Luxi.hs
- htools/Ganeti/HTools/Node.hs 4 additions, 4 deletionshtools/Ganeti/HTools/Node.hs
- htools/Ganeti/HTools/Rapi.hs 2 additions, 1 deletionhtools/Ganeti/HTools/Rapi.hs
- htools/Ganeti/HTools/Simu.hs 1 addition, 1 deletionhtools/Ganeti/HTools/Simu.hs
Loading
Please register or sign in to comment