Merge branch 'devel-2.5'
authorMichael Hanselmann <hansmi@google.com>
Thu, 12 Apr 2012 19:17:24 +0000 (21:17 +0200)
committerMichael Hanselmann <hansmi@google.com>
Fri, 13 Apr 2012 13:19:34 +0000 (15:19 +0200)
commit5ad68a231454a2112fb10352b1856467ef1d9b10
tree7309433f35bf431c6a75ee7ce271e83cdb5fa99b
parentd6f58310e6e1e92f287ff0e720dabad7eda84e11
parent6bc3ed14b779225cc725b07ffa47739ccdf4046c
Merge branch 'devel-2.5'

* devel-2.5: (29 commits)
  gnt-* {add,list,remove}-tags: Unify options
  Bump version for 2.5.0 final release
  configure.ac: Fix “too many arguments” error
  Fix extra whitespace
  Further fixes concerning drbd port release
  Fix a bug concerning TCP port release
  Fix extra whitespace
  Fix a bug concerning TCP port release
  ganeti.initd: Add “status” action
  Add whitelist for opcodes using BGL
  LUOobCommand: acquire BGL in shared mode
  Fix docstring bug
  LUNodeAdd: Verify version in Prereq
  LUNodeAdd: Verify version in Prereq
  Fix LV status parsing to accept newer LVM
  gnt-instance info: Show node group information
  cmdlib: Factorize checking acquired node group locks
  Bump version for 2.5.0~rc6 release
  cmdlib: Stop forking in LUClusterQuery
  locking: Notify only once on release
  ...

Conflicts:
NEWS: Trivial
daemons/daemon-util.in: Copyright line
lib/client/gnt_group.py: Tag operations
lib/cmdlib.py: Not so trivial, hopefully correct

Signed-off-by: Michael Hanselmann <hansmi@google.com>
Reviewed-by: Iustin Pop <iustin@google.com>
18 files changed:
NEWS
configure.ac
daemons/daemon-util.in
lib/bdev.py
lib/cli.py
lib/client/gnt_cluster.py
lib/client/gnt_group.py
lib/client/gnt_instance.py
lib/client/gnt_node.py
lib/cmdlib.py
lib/config.py
lib/hypervisor/hv_kvm.py
lib/locking.py
lib/runtime.py
lib/server/masterd.py
qa/qa_cluster.py
test/ganeti.locking_unittest.py
test/ganeti.mcpu_unittest.py