Merge commit 'origin/next' into branch-2.1
authorIustin Pop <iustin@google.com>
Thu, 13 Aug 2009 11:15:33 +0000 (13:15 +0200)
committerIustin Pop <iustin@google.com>
Thu, 13 Aug 2009 11:41:42 +0000 (13:41 +0200)
commitb142ef15f998cc318715fa5c13ea8fd802a61bc3
tree56f5fa6bd4871c3d696178ad5ddbc85e35c7f639
parent05d47e331790ae95e0900ea6a23f23bf0c8e2eec
parentbec0522b7ea02afaa00977da1ac71175df43df02
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>
19 files changed:
Makefile.am
configure.ac
daemons/ganeti-masterd
daemons/ganeti-noded
doc/iallocator.rst
lib/backend.py
lib/bdev.py
lib/cmdlib.py
lib/constants.py
lib/mcpu.py
lib/objects.py
lib/opcodes.py
lib/rpc.py
man/gnt-backup.sgml
man/gnt-cluster.sgml
man/gnt-instance.sgml
scripts/gnt-backup
scripts/gnt-cluster
scripts/gnt-instance