Merge branch 'stable-2.11' into stable-2.12
authorKlaus Aehlig <aehlig@google.com>
Mon, 15 Sep 2014 12:25:35 +0000 (14:25 +0200)
committerKlaus Aehlig <aehlig@google.com>
Mon, 15 Sep 2014 12:51:44 +0000 (14:51 +0200)
commit0fe37fcc69a5be91eee312a3e643f3d0ebcbadb8
tree6857fd7c48dbf4f5e326ebee692cf4c64f154ee3
parent76213e787f86c548844b74da9d760e0aead731b1
parent8ed2f50a2c94e93be187659a347ba945bac77f8d
Merge branch 'stable-2.11' into stable-2.12

* stable-2.11
  Change license statment in newly added files

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

Conflicts:
lib/backend.py
lib/cli.py
lib/client/gnt_cluster.py
lib/client/gnt_group.py
lib/client/gnt_instance.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_storage.py
lib/cmdlib/instance_utils.py
lib/config.py
lib/hypervisor/hv_kvm/__init__.py
lib/objects.py
lib/rpc/transport.py
lib/rpc_defs.py
lib/serializer.py
lib/server/noded.py
lib/utils/io.py
src/AutoConf.hs.in
src/Ganeti/Constants.hs
src/Ganeti/Objects.hs
src/Ganeti/OpCodes.hs
src/Ganeti/OpParams.hs
src/Ganeti/Path.hs
src/Ganeti/Query/Server.hs
src/Ganeti/Runtime.hs
src/Ganeti/THH.hs
src/Ganeti/Types.hs
test/py/cmdlib/testsupport/lock_manager_mock.py
tools/kvm-ifup.in
(all trivial)

Signed-off-by: Klaus Aehlig <aehlig@google.com>
Reviewed-by: Hrvoje Ribicic <riba@google.com>
191 files changed:
autotools/build-rpc
daemons/daemon-util.in
daemons/import-export
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_group.py
lib/client/gnt_instance.py
lib/client/gnt_job.py
lib/client/gnt_network.py
lib/client/gnt_node.py
lib/client/gnt_os.py
lib/cmdlib/backup.py
lib/cmdlib/base.py
lib/cmdlib/cluster.py
lib/cmdlib/common.py
lib/cmdlib/group.py
lib/cmdlib/instance.py
lib/cmdlib/instance_migration.py
lib/cmdlib/instance_operation.py
lib/cmdlib/instance_query.py
lib/cmdlib/instance_storage.py
lib/cmdlib/instance_utils.py
lib/cmdlib/misc.py
lib/cmdlib/network.py
lib/cmdlib/node.py
lib/cmdlib/operating_system.py
lib/cmdlib/test.py
lib/compat.py
lib/config.py
lib/daemon.py
lib/errors.py
lib/ht.py
lib/hypervisor/hv_base.py
lib/hypervisor/hv_kvm/__init__.py
lib/hypervisor/hv_xen.py
lib/impexpd/__init__.py
lib/jqueue/__init__.py
lib/locking.py
lib/luxi.py
lib/masterd/iallocator.py
lib/masterd/instance.py
lib/mcpu.py
lib/objects.py
lib/pathutils.py
lib/query.py
lib/rapi/baserlib.py
lib/rapi/client.py
lib/rapi/rlib2.py
lib/rpc/client.py
lib/rpc/node.py
lib/rpc/transport.py
lib/rpc_defs.py
lib/runtime.py
lib/serializer.py
lib/server/masterd.py
lib/server/noded.py
lib/ssconf.py
lib/tools/burnin.py
lib/tools/ensure_dirs.py
lib/utils/__init__.py
lib/utils/algo.py
lib/utils/io.py
lib/utils/security.py
lib/utils/storage.py
lib/utils/text.py
lib/vcluster.py
lib/watcher/__init__.py
lib/workerpool.py
qa/ganeti-qa.py
qa/qa_cluster.py
qa/qa_config.py
qa/qa_env.py
qa/qa_instance.py
qa/qa_job.py
qa/qa_job_utils.py
qa/qa_performance.py
qa/qa_rapi.py
qa/qa_utils.py
src/AutoConf.hs.in
src/Ganeti/BasicTypes.hs
src/Ganeti/Confd/ClientFunctions.hs
src/Ganeti/Confd/Server.hs
src/Ganeti/Confd/Types.hs
src/Ganeti/Config.hs
src/Ganeti/Constants.hs
src/Ganeti/Daemon.hs
src/Ganeti/DataCollectors/InstStatus.hs
src/Ganeti/DataCollectors/InstStatusTypes.hs
src/Ganeti/DataCollectors/Lv.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/Node.hs
src/Ganeti/HTools/Program/Harep.hs
src/Ganeti/HTools/Program/Hscan.hs
src/Ganeti/JQScheduler.hs
src/Ganeti/JQueue.hs
src/Ganeti/JSON.hs
src/Ganeti/Logging.hs
src/Ganeti/Luxi.hs
src/Ganeti/Network.hs
src/Ganeti/Objects.hs
src/Ganeti/OpCodes.hs
src/Ganeti/OpParams.hs
src/Ganeti/Path.hs
src/Ganeti/Query/Common.hs
src/Ganeti/Query/Export.hs
src/Ganeti/Query/Group.hs
src/Ganeti/Query/Instance.hs
src/Ganeti/Query/Job.hs
src/Ganeti/Query/Language.hs
src/Ganeti/Query/Locks.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/THH.hs
src/Ganeti/Types.hs
src/Ganeti/UDSServer.hs
src/Ganeti/Utils.hs
src/hluxid.hs
src/hs2py.hs
src/rpc-test.hs
test/hs/Test/Ganeti/HTools/Instance.hs
test/hs/Test/Ganeti/HTools/Types.hs
test/hs/Test/Ganeti/JQueue.hs
test/hs/Test/Ganeti/JSON.hs
test/hs/Test/Ganeti/Luxi.hs
test/hs/Test/Ganeti/Objects.hs
test/hs/Test/Ganeti/OpCodes.hs
test/hs/Test/Ganeti/Query/Instance.hs
test/hs/Test/Ganeti/Query/Query.hs
test/hs/Test/Ganeti/Rpc.hs
test/hs/Test/Ganeti/Runtime.hs
test/hs/Test/Ganeti/Ssconf.hs
test/hs/Test/Ganeti/THH.hs
test/hs/Test/Ganeti/TestCommon.hs
test/hs/Test/Ganeti/Types.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/instance_unittest.py
test/py/cmdlib/node_unittest.py
test/py/cmdlib/test_unittest.py
test/py/cmdlib/testsupport/__init__.py
test/py/cmdlib/testsupport/cmdlib_testcase.py
test/py/cmdlib/testsupport/config_mock.py
test/py/cmdlib/testsupport/processor_mock.py
test/py/daemon-util_unittest.bash
test/py/ganeti.config_unittest.py
test/py/ganeti.hooks_unittest.py
test/py/ganeti.hypervisor.hv_kvm_unittest.py
test/py/ganeti.impexpd_unittest.py
test/py/ganeti.jqueue_unittest.py
test/py/ganeti.locking_unittest.py
test/py/ganeti.mcpu_unittest.py
test/py/ganeti.objects_unittest.py
test/py/ganeti.ovf_unittest.py
test/py/ganeti.query_unittest.py
test/py/ganeti.rapi.baserlib_unittest.py
test/py/ganeti.rapi.client_unittest.py
test/py/ganeti.rapi.rlib2_unittest.py
test/py/ganeti.rpc_unittest.py
test/py/ganeti.runtime_unittest.py
test/py/ganeti.serializer_unittest.py
test/py/ganeti.utils.security_unittest.py
test/py/ganeti.utils.storage_unittest.py
test/py/ganeti.workerpool_unittest.py
tools/cfgupgrade
tools/cfgupgrade12
tools/confd-client
tools/ganeti-listrunner
tools/kvm-ifup.in
tools/lvmstrap
tools/move-instance
tools/net-common.in
tools/vcluster-setup.in