Skip to content
Snippets Groups Projects
Commit 659d769d authored by Dato Simó's avatar Dato Simó
Browse files

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: default avatarDato Simó <dato@google.com>
Reviewed-by: default avatarIustin Pop <iustin@google.com>
parents 18ccdced b898de8f
No related branches found
No related tags found
No related merge requests found
Showing
with 57 additions and 27 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment