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

Merge branch 'devel-2.5'

* devel-2.5:
  Fix wrong option names in QA and cluster-merge
  Bump version to 2.5.0~rc5, update NEWS
  Add UnescapeAndSplit unittest for multi-escapes
  Fix a bug in command line option parsing code
  cli: Disable abbreviation matching for options
  Bump version to 2.5.0~rc5, update NEWS
  Add UnescapeAndSplit unittest for multi-escapes
  Fix a bug in command line option parsing code

Conflicts:
lib/cli.py: Trivial

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

author	Michael Hanselmann <hansmi@google.com>
	Thu, 19 Jan 2012 12:55:06 +0000 (13:55 +0100)
committer	Michael Hanselmann <hansmi@google.com>
	Thu, 19 Jan 2012 13:14:50 +0000 (14:14 +0100)
commit	59d81cb3cec586db8fc933357f099f46ddafb447
tree	c8c587d45f195fcb0298bb235de3269a29c786e4	tree \| snapshot
parent	f356202af8da32b1a7a6fbdce4e8d87b1be63aec	commit \| diff
parent	431f2a80e044b55218ea614475416916145ce3f7	commit \| diff

NEWS	diff1 \|	diff2 \|	blob \| history
configure.ac	diff1 \|	diff2 \|	blob \| history
lib/cli.py	diff1 \|	diff2 \|	blob \| history
lib/utils/text.py	diff1 \|	diff2 \|	blob \| history
qa/qa_cluster.py	diff1 \|	diff2 \|	blob \| history
qa/qa_instance.py	diff1 \|	diff2 \|	blob \| history
test/ganeti.utils.text_unittest.py	diff1 \|	diff2 \|	blob \| history