Revision 5ad68a23
| ID | 5ad68a231454a2112fb10352b1856467ef1d9b10 |
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>
Files
- added
- modified
- copied
- renamed
- deleted