code.grnet.gr Git - ganeti-local/commit

Merge branch 'devel-2.2'

* devel-2.2:
  Add simple unittest for utils.CommaJoin
  LUDelTags: Improve formatting of error message
  LUGetTags: Acquire locks in shared mode
  gnt-cluster: Replace hardcoded “xenvg” with value retrieved from master
  Export VG name via LUQueryConfigValues
  RAPI QA: Override MAC address when moving instance
  move-instance: Allow overriding instance parameters
  cli: Move parsing of --net option to separate function
  kvm: collapse two consecutive extend calls
  kvm: Introduce support for -mem-path

Conflicts:
test/ganeti.cli_unittest.py: Trivial

Signed-off-by: Michael Hanselmann <hansmi@google.com>
Reviewed-by: Iustin Pop <iustin@google.com>

author	Michael Hanselmann <hansmi@google.com>
	Tue, 5 Oct 2010 15:03:40 +0000 (17:03 +0200)
committer	Michael Hanselmann <hansmi@google.com>
	Tue, 5 Oct 2010 15:08:57 +0000 (17:08 +0200)
commit	72884fefe9b708b4d4486aa925a252b94cfaf381
tree	d658a1843d8bc2d2f5bdddd9e8057a786c106935	tree \| snapshot
parent	e32e788631cff89762721ce23c457ed60b57dca4	commit \| diff
parent	750022e03df3e33f7cb429665173541085c972dd	commit \| diff

lib/cli.py	diff1 \|	diff2 \|	blob \| history
lib/cmdlib.py	diff1 \|	diff2 \|	blob \| history
lib/constants.py	diff1 \|	diff2 \|	blob \| history
lib/hypervisor/hv_kvm.py	diff1 \|	diff2 \|	blob \| history
scripts/gnt-cluster	diff1 \|	diff2 \|	blob \| history
test/ganeti.cli_unittest.py	diff1 \|	diff2 \|	blob \| history
test/ganeti.utils_unittest.py	diff1 \|	diff2 \|	blob \| history