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)
commit5ee6fffc155676e74db2fc0c7d8383f9b530bac1
treea401331d1b1943154eef545aa8728c2336645b76
parentdb5bce34ef3d87f82afb7a8283a308a30737dd95
parent227e546fb58ddf3b267c3a2b3b2d7ec1bdecc5d6
Merge branch 'devel-2.2'

* 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>
configure.ac
lib/cli.py
lib/hypervisor/hv_kvm.py
lib/utils.py
man/ganeti.sgml
scripts/gnt-instance
scripts/gnt-os