On Fri, Jun 13, 2014 at 02:58:24PM +0200, 'Petr Pudlak' via ganeti-devel wrote: > commit 8b13b50fff40e2522e789f86d8f737542b28efcd > Merge: 10e7e07 f260951 > Author: Petr Pudlak <[email protected]> > Date: Fri Jun 13 13:34:48 2014 +0200 > > 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
LGTM. THANKS!! -- Klaus Aehlig Google Germany GmbH, Dienerstr. 12, 80331 Muenchen Registergericht und -nummer: Hamburg, HRB 86891 Sitz der Gesellschaft: Hamburg Geschaeftsfuehrer: Graham Law, Katherine Stephens
