• Klaus Aehlig's avatar
    Merge branch 'stable-2.11' into stable-2.12 · 0fe37fcc
    Klaus Aehlig authored
    * 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: default avatarKlaus Aehlig <aehlig@google.com>
    Reviewed-by: default avatarHrvoje Ribicic <riba@google.com>
    0fe37fcc
AutoConf.hs.in 5.2 KB