Revision 580c971e
| ID | 580c971ea7bccf63c45fa294596186a13fc3de12 |
| Parent | 661515f6, adc523ab |
| Child | 3de8301d |
Merge branch 'devel-2.4'
- devel-2.4: (24 commits)
mlock: fail gracefully if libc.so.6 cannot be loaded
Allow creating the DRBD metadev in a different VG
Make _GenerateDRBD8Branch accept different VG names
Fix WriteFile with unicode data
Replace disks: keep the meta device in the same VG
Fix for multiple VGs - PlainToDrbd and replace-disks
Fix potential data-loss in utils.WriteFile
Improve error messages in cluster verify/OS
Prevent readding of the master node
Fix punctuation in an error message
cli: Fix wrong argument kind for groups
Quote filename in gnt-instance.8
Fix typo in LUGroupAssignNodes
gnt-instance info: automatically request locking
Document the dependency on OOB for gnt-node power
Fix master IP activation in failover with no-voting
disk wiping: fix bug in chunk size computation
Fix bug in watcher
Release locks before wiping disks during instance creation
utils.WriteFile: Close file before renaming
...
Conflicts:
lib/cmdlib.py: Disk parameter constants
man/gnt-instance.rst: Trivial
man/gnt-node.rst: Trivial
Signed-off-by: Michael Hanselmann <hansmi@google.com>
Reviewed-by: Iustin Pop <iustin@google.com>
Files
- added
- modified
- copied
- renamed
- deleted