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>
No related branches found
No related tags found
Showing
- NEWS 25 additions, 3 deletionsNEWS
- configure.ac 1 addition, 1 deletionconfigure.ac
- daemons/daemon-util.in 25 additions, 1 deletiondaemons/daemon-util.in
- doc/examples/ganeti.initd.in 27 additions, 0 deletionsdoc/examples/ganeti.initd.in
- lib/bdev.py 3 additions, 3 deletionslib/bdev.py
- lib/cli.py 2 additions, 2 deletionslib/cli.py
- lib/client/gnt_cluster.py 7 additions, 5 deletionslib/client/gnt_cluster.py
- lib/client/gnt_group.py 3 additions, 3 deletionslib/client/gnt_group.py
- lib/client/gnt_instance.py 12 additions, 4 deletionslib/client/gnt_instance.py
- lib/client/gnt_node.py 4 additions, 3 deletionslib/client/gnt_node.py
- lib/cmdlib.py 104 additions, 47 deletionslib/cmdlib.py
- lib/config.py 15 additions, 1 deletionlib/config.py
- lib/hypervisor/hv_kvm.py 16 additions, 16 deletionslib/hypervisor/hv_kvm.py
- lib/locking.py 51 additions, 24 deletionslib/locking.py
- lib/runtime.py 36 additions, 0 deletionslib/runtime.py
- lib/server/masterd.py 4 additions, 0 deletionslib/server/masterd.py
- qa/qa_cluster.py 2 additions, 1 deletionqa/qa_cluster.py
- test/ganeti.locking_unittest.py 103 additions, 1 deletiontest/ganeti.locking_unittest.py
- test/ganeti.mcpu_unittest.py 23 additions, 0 deletionstest/ganeti.mcpu_unittest.py
- test/ganeti.runtime_unittest.py 33 additions, 0 deletionstest/ganeti.runtime_unittest.py
Loading
Please register or sign in to comment