Merge branch 'stable-2.11' into stable-2.12
authorPetr Pudlak <pudlak@google.com>
Fri, 13 Jun 2014 11:34:48 +0000 (13:34 +0200)
committerPetr Pudlak <pudlak@google.com>
Fri, 13 Jun 2014 13:07:59 +0000 (15:07 +0200)
commit1d328c1ccf057405d6b8a8438d3bbdd23c4b48ca
tree346c0439f3656735f73ad78712eb5dc1ebe13e8a
parent10e7e07eba2e7fcb2705fe2cae8fe6e203305344
parentf2609511697526cf5344fcf6c930c964bf67adaa
Merge branch 'stable-2.11' into stable-2.12

* stable-2.11
  Bump revision to 2.11.2
  Prepare NEWS file for 2.11.2 release
  Document '--user-shutdown' cluster parameter
  Consider 'Cluster.enabled_user_shutdown' in instance queries
  Extend QA with cluster wide user shutdown tests
  Modify how the KVM daemon is started/stopped
  RPC to start/stop a daemon on a node
  KVM daemon decides if it should run
  Add hypervisor list, user shutdown, and vm capable to Ssconf
  Add 'enabled_user_shutdown' cluster field
  Improve Python conditionals 'is None' and 'is not None'
  Reuse existing helper function to stop a daemon
  Remove unused local variable
  Fix docstring and relax type contraints
  Fix docstrings for hvparams
  Fix docstring
  Improve python dict check
  Fix instance user shutdown QA

* stable-2.10
  Remove 'physical_id' from testing data
  Support disk hotplug with userspace access
  Check for SSL encoding inconsistencies

Conflicts:
NEWS
configure.ac
lib/bootstrap.py
lib/client/gnt_cluster.py
lib/cmdlib/cluster.py
lib/cmdlib/common.py
lib/objects.py
man/gnt-cluster.rst
qa/ganeti-qa.py
src/Ganeti/Objects.hs
src/Ganeti/OpCodes.hs
src/Ganeti/Query/Server.hs
src/Ganeti/Ssconf.hs
test/data/instance-prim-sec.txt
test/hs/Test/Ganeti/OpCodes.hs
test/hs/Test/Ganeti/Ssconf.hs
test/py/cfgupgrade_unittest.py
test/py/daemon-util_unittest.bash
tools/cfgupgrade
Resolutions:
  - Merge newly added configuration options in 2.11 and 2.12
  - Include KVMD changes from 2.11
  - Update the testing 2.11 configuration for up/downgrades

Signed-off-by: Petr Pudlak <pudlak@google.com>
Reviewed-by: Klaus Aehlig <aehlig@google.com>
44 files changed:
NEWS
daemons/daemon-util.in
lib/backend.py
lib/bootstrap.py
lib/cli.py
lib/client/gnt_cluster.py
lib/cmdlib/cluster.py
lib/cmdlib/common.py
lib/cmdlib/instance.py
lib/cmdlib/instance_operation.py
lib/cmdlib/instance_query.py
lib/cmdlib/instance_storage.py
lib/cmdlib/node.py
lib/config.py
lib/hypervisor/hv_kvm/__init__.py
lib/objects.py
lib/query.py
lib/rpc_defs.py
lib/server/noded.py
lib/ssconf.py
lib/utils/__init__.py
lib/watcher/__init__.py
man/gnt-cluster.rst
man/gnt-instance.rst
qa/ganeti-qa.py
qa/qa_cluster.py
qa/qa_instance.py
src/Ganeti/Constants.hs
src/Ganeti/Objects.hs
src/Ganeti/OpCodes.hs
src/Ganeti/OpParams.hs
src/Ganeti/Query/Server.hs
src/Ganeti/Ssconf.hs
src/Ganeti/Types.hs
src/Ganeti/Utils.hs
test/data/cluster_config_2.11.json
test/hs/Test/Ganeti/OpCodes.hs
test/hs/Test/Ganeti/Ssconf.hs
test/py/cfgupgrade_unittest.py
test/py/cmdlib/backup_unittest.py
test/py/cmdlib/instance_unittest.py
test/py/daemon-util_unittest.bash
test/py/ganeti.query_unittest.py
tools/cfgupgrade