Merge branch 'stable-2.10' into stable-2.11
authorKlaus Aehlig <aehlig@google.com>
Fri, 12 Sep 2014 09:20:13 +0000 (11:20 +0200)
committerKlaus Aehlig <aehlig@google.com>
Fri, 12 Sep 2014 09:31:33 +0000 (11:31 +0200)
commitdd96a3a78d423daa7867c1d2b15204f9e0303b58
tree7d0bb44ba9eccf99073b0d431cfd47cf6da0633e
parent8c15e7bfda55d17afc428cb33035ffec2b4c0edd
parentfe42a791748119a5d7072e0527d10aa3545d352a
Merge branch 'stable-2.10' into stable-2.11

* stable-2.10
  Update the license statement
  Fix handling of the --online option
  Add warning against hvparam changes with live migrations

Conflicts:
lib/luxi.py
src/Ganeti/Luxi.hs
src/Ganeti/THH.hs
test/py/ganeti.luxi_unittest.py
(all trivial)

Signed-off-by: Klaus Aehlig <aehlig@google.com>
Reviewed-by: Petr Pudlak <pudlak@google.com>
188 files changed:
autotools/build-bash-completion
daemons/daemon-util.in
lib/backend.py
lib/bootstrap.py
lib/build/sphinx_ext.py
lib/cli.py
lib/client/gnt_backup.py
lib/client/gnt_cluster.py
lib/client/gnt_debug.py
lib/client/gnt_instance.py
lib/client/gnt_network.py
lib/client/gnt_node.py
lib/cmdlib/__init__.py
lib/cmdlib/backup.py
lib/cmdlib/cluster.py
lib/cmdlib/common.py
lib/cmdlib/group.py
lib/cmdlib/instance.py
lib/cmdlib/instance_operation.py
lib/cmdlib/instance_query.py
lib/cmdlib/instance_storage.py
lib/cmdlib/instance_utils.py
lib/cmdlib/network.py
lib/cmdlib/node.py
lib/cmdlib/query.py
lib/config.py
lib/daemon.py
lib/ht.py
lib/http/__init__.py
lib/http/server.py
lib/hypervisor/hv_base.py
lib/hypervisor/hv_chroot.py
lib/hypervisor/hv_fake.py
lib/hypervisor/hv_kvm.py
lib/hypervisor/hv_lxc.py
lib/hypervisor/hv_xen.py
lib/jqueue.py
lib/luxi.py
lib/masterd/iallocator.py
lib/masterd/instance.py
lib/netutils.py
lib/network.py
lib/objects.py
lib/opcodes.py.in_before
lib/opcodes_base.py
lib/outils.py
lib/pathutils.py
lib/query.py
lib/rapi/baserlib.py
lib/rapi/client.py
lib/rapi/rlib2.py
lib/rapi/testutils.py
lib/rpc/node.py
lib/rpc_defs.py
lib/runtime.py
lib/server/masterd.py
lib/server/noded.py
lib/server/rapi.py
lib/ssconf.py
lib/ssh.py
lib/storage/base.py
lib/storage/bdev.py
lib/storage/container.py
lib/storage/drbd.py
lib/storage/filestorage.py
lib/tools/burnin.py
lib/tools/ensure_dirs.py
lib/utils/__init__.py
lib/utils/io.py
lib/utils/process.py
lib/utils/storage.py
lib/utils/version.py
lib/utils/x509.py
lib/vcluster.py
lib/watcher/__init__.py
lib/watcher/state.py
qa/ganeti-qa.py
qa/qa_cluster.py
qa/qa_config.py
qa/qa_daemon.py
qa/qa_group.py
qa/qa_instance.py
qa/qa_job.py
qa/qa_network.py
qa/qa_node.py
qa/qa_rapi.py
qa/qa_utils.py
src/AutoConf.hs.in
src/Ganeti/BasicTypes.hs
src/Ganeti/Config.hs
src/Ganeti/ConfigReader.hs
src/Ganeti/ConstantUtils.hs
src/Ganeti/Constants.hs
src/Ganeti/Daemon.hs
src/Ganeti/Errors.hs
src/Ganeti/HTools/Backend/Luxi.hs
src/Ganeti/HTools/Backend/Text.hs
src/Ganeti/HTools/CLI.hs
src/Ganeti/HTools/Cluster.hs
src/Ganeti/HTools/Instance.hs
src/Ganeti/HTools/Program/Harep.hs
src/Ganeti/HTools/Program/Hbal.hs
src/Ganeti/HTools/Program/Hscan.hs
src/Ganeti/HTools/Program/Main.hs
src/Ganeti/HTools/Types.hs
src/Ganeti/Hs2Py/GenOpCodes.hs
src/Ganeti/Hs2Py/ListConstants.hs.in
src/Ganeti/Hs2Py/OpDoc.hs
src/Ganeti/JQueue.hs
src/Ganeti/JSON.hs
src/Ganeti/Logging.hs
src/Ganeti/Luxi.hs
src/Ganeti/Monitoring/Server.hs
src/Ganeti/Objects.hs
src/Ganeti/OpCodes.hs
src/Ganeti/OpParams.hs
src/Ganeti/Path.hs
src/Ganeti/PyValue.hs
src/Ganeti/Query/Cluster.hs
src/Ganeti/Query/Common.hs
src/Ganeti/Query/Filter.hs
src/Ganeti/Query/Group.hs
src/Ganeti/Query/Network.hs
src/Ganeti/Query/Node.hs
src/Ganeti/Query/Query.hs
src/Ganeti/Query/Server.hs
src/Ganeti/Query/Types.hs
src/Ganeti/Rpc.hs
src/Ganeti/Runtime.hs
src/Ganeti/Ssconf.hs
src/Ganeti/Storage/Utils.hs
src/Ganeti/THH.hs
src/Ganeti/Types.hs
src/Ganeti/Utils.hs
src/ganeti-mond.hs
src/rpc-test.hs
test/hs/Test/Ganeti/Common.hs
test/hs/Test/Ganeti/Luxi.hs
test/hs/Test/Ganeti/Objects.hs
test/hs/Test/Ganeti/OpCodes.hs
test/hs/Test/Ganeti/Rpc.hs
test/hs/Test/Ganeti/Runtime.hs
test/hs/Test/Ganeti/Ssconf.hs
test/hs/Test/Ganeti/TestCommon.hs
test/hs/Test/Ganeti/Utils.hs
test/hs/htest.hs
test/py/cfgupgrade_unittest.py
test/py/cmdlib/backup_unittest.py
test/py/cmdlib/cluster_unittest.py
test/py/cmdlib/cmdlib_unittest.py
test/py/cmdlib/group_unittest.py
test/py/cmdlib/instance_query_unittest.py
test/py/cmdlib/instance_unittest.py
test/py/cmdlib/node_unittest.py
test/py/cmdlib/testsupport/config_mock.py
test/py/cmdlib/testsupport/rpc_runner_mock.py
test/py/daemon-util_unittest.bash
test/py/docs_unittest.py
test/py/ganeti.backend_unittest.py
test/py/ganeti.client.gnt_cluster_unittest.py
test/py/ganeti.config_unittest.py
test/py/ganeti.hooks_unittest.py
test/py/ganeti.hypervisor.hv_chroot_unittest.py
test/py/ganeti.hypervisor.hv_fake_unittest.py
test/py/ganeti.hypervisor.hv_kvm_unittest.py
test/py/ganeti.hypervisor.hv_lxc_unittest.py
test/py/ganeti.hypervisor.hv_xen_unittest.py
test/py/ganeti.jqueue_unittest.py
test/py/ganeti.luxi_unittest.py
test/py/ganeti.mcpu_unittest.py
test/py/ganeti.netutils_unittest.py
test/py/ganeti.objects_unittest.py
test/py/ganeti.opcodes_unittest.py
test/py/ganeti.query_unittest.py
test/py/ganeti.rapi.baserlib_unittest.py
test/py/ganeti.rapi.rlib2_unittest.py
test/py/ganeti.rapi.testutils_unittest.py
test/py/ganeti.rpc_unittest.py
test/py/ganeti.ssconf_unittest.py
test/py/ganeti.storage.filestorage_unittest.py
test/py/ganeti.utils.storage_unittest.py
test/py/ganeti.utils.version_unittest.py
test/py/ganeti.utils.x509_unittest.py
test/py/import-export_unittest-helper
tools/cfgupgrade
tools/cfgupgrade12
tools/move-instance
tools/post-upgrade