Merge branch 'devel-2.2'
authorMichael Hanselmann <hansmi@google.com>
Wed, 22 Sep 2010 14:54:22 +0000 (16:54 +0200)
committerMichael Hanselmann <hansmi@google.com>
Wed, 22 Sep 2010 14:57:11 +0000 (16:57 +0200)
* devel-2.2:
  NEWS: Add 2.2.0~rc2 release date
  Bump version to 2.2.0~rc2
  Fix mac checker regex
  Remove two old aliases
  Fix migration on new KVMs
  Fix typo in ganeti man page
  cli: Pass options in {Add,Remove}Tags
  Prepare 2.2.0~rc2 release

Signed-off-by: Michael Hanselmann <hansmi@google.com>
Reviewed-by: RenĂ© Nussbaumer <rn@google.com>

1  2 
configure.ac
lib/cli.py
lib/hypervisor/hv_kvm.py
lib/utils.py
man/ganeti.sgml
scripts/gnt-instance
scripts/gnt-os

diff --cc configure.ac
Simple merge
diff --cc lib/cli.py
Simple merge
Simple merge
diff --cc lib/utils.py
Simple merge
diff --cc man/ganeti.sgml
Simple merge
Simple merge
diff --cc scripts/gnt-os
Simple merge