Merge commit 'origin/next' into branch-2.1
* commit 'origin/next': (28 commits)
Fix a typo in InitCluster
Ignore results from drained nodes in iallocator
Ship the ethers hook
Ethers hook, compatibility with old lockfile
Remove a few unused imports from noded/masterd
Move HVM's device_model to a hypervisor parameter
Implement the KERNEL_PATH parameter for xen-hvm
Upgrade be/hv params with default values
Add cluster-init --no-etc-hosts parameter
objects: add configuration upgrade system
Update NEWS and version for 2.0.3 release
example ethers hook: use lockfile-progs
ethers hook lock: use logger not echo
ethers hook: reduce the probability of data loss
devel/upload: revert rsync -p
export: add meaningful exit code
Fix detecting of errors in export
Implement gnt-cluster check-disk-sizes
rpc: add rpc call for getting disk size
bdev: Add function for reading actual disk size
...
Conflicts:
daemons/ganeti-masterd - trivial, kept 2.1 version
lib/bootstrap.py - trivial, kept 2.1 version
lib/cmdlib.py - integrated the 2.0.3 changes
lib/constants.py - trivial
lib/hypervisor/hv_xen.py - trivial, kept 2.1 version
lib/objects.py - trivial, kept 2.1 version
lib/opcodes.py - integrated the 2.0.3 changes
Signed-off-by:
Iustin Pop <iustin@google.com>
Showing
- Makefile.am 3 additions, 0 deletionsMakefile.am
- NEWS 12 additions, 0 deletionsNEWS
- configure.ac 1 addition, 1 deletionconfigure.ac
- daemons/ganeti-masterd 0 additions, 3 deletionsdaemons/ganeti-masterd
- daemons/ganeti-noded 8 additions, 2 deletionsdaemons/ganeti-noded
- devel/upload.in 28 additions, 23 deletionsdevel/upload.in
- doc/examples/bash_completion.in 1 addition, 1 deletiondoc/examples/bash_completion.in
- doc/examples/hooks/ethers 9 additions, 6 deletionsdoc/examples/hooks/ethers
- doc/iallocator.rst 7 additions, 3 deletionsdoc/iallocator.rst
- lib/backend.py 29 additions, 3 deletionslib/backend.py
- lib/bdev.py 32 additions, 1 deletionlib/bdev.py
- lib/cmdlib.py 123 additions, 3 deletionslib/cmdlib.py
- lib/constants.py 0 additions, 1 deletionlib/constants.py
- lib/mcpu.py 1 addition, 0 deletionslib/mcpu.py
- lib/objects.py 17 additions, 0 deletionslib/objects.py
- lib/opcodes.py 21 additions, 1 deletionlib/opcodes.py
- lib/rpc.py 9 additions, 0 deletionslib/rpc.py
- man/gnt-backup.sgml 10 additions, 0 deletionsman/gnt-backup.sgml
- man/gnt-cluster.sgml 32 additions, 0 deletionsman/gnt-cluster.sgml
- man/gnt-instance.sgml 11 additions, 0 deletionsman/gnt-instance.sgml
Loading
Please register or sign in to comment