Merge remote branch 'origin/stable-2.1' into devel-2.1
authorMichael Hanselmann <hansmi@google.com>
Mon, 1 Feb 2010 12:55:56 +0000 (13:55 +0100)
committerMichael Hanselmann <hansmi@google.com>
Mon, 1 Feb 2010 12:55:56 +0000 (13:55 +0100)
* origin/stable-2.1:
  Bump version to 2.1.0~rc5
  Fix missing bridge for xen instances
  Fix flipping MC flag bug
  ganeti-watcher: ensure confd is running as well


No differences found