Merge branch 'master' into next
* master:
Update NEWS and version for 2.0.3 release
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
Implement --ignore-size in activate-disks
Add ignore size support in _AssembleInstanceDisks
Add a objects.Disk.UnsetSize() method
bdev: allow ignoring of size in Assemble()
Fix instance import net option
Simplify the devel/upload script
Add a Copy method to object.ConfigObject
Extend call_node_start_master rpc with no_voting
Conflicts:
daemons/ganeti-masterd
s/SimpleConfigReader/SimpleStore/ VS start-master no-voting
(kept both)
Signed-off-by:
Guido Trotter <ultrotter@google.com>
Showing
- Makefile.am 1 addition, 0 deletionsMakefile.am
- NEWS 12 additions, 0 deletionsNEWS
- configure.ac 1 addition, 1 deletionconfigure.ac
- daemons/ganeti-masterd 1 addition, 1 deletiondaemons/ganeti-masterd
- daemons/ganeti-noded 9 additions, 1 deletiondaemons/ganeti-noded
- devel/upload.in 28 additions, 23 deletionsdevel/upload.in
- doc/examples/bash_completion.in 1 addition, 1 deletiondoc/examples/bash_completion.in
- lib/backend.py 44 additions, 6 deletionslib/backend.py
- lib/bdev.py 32 additions, 1 deletionlib/bdev.py
- lib/bootstrap.py 2 additions, 3 deletionslib/bootstrap.py
- lib/cmdlib.py 122 additions, 3 deletionslib/cmdlib.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 11 additions, 2 deletionslib/rpc.py
- man/gnt-backup.sgml 10 additions, 0 deletionsman/gnt-backup.sgml
- man/gnt-cluster.sgml 32 additions, 8 deletionsman/gnt-cluster.sgml
- man/gnt-instance.sgml 11 additions, 0 deletionsman/gnt-instance.sgml
- scripts/gnt-backup 22 additions, 3 deletionsscripts/gnt-backup
- scripts/gnt-cluster 16 additions, 0 deletionsscripts/gnt-cluster
Loading
Please register or sign in to comment