On Thu, Apr 23, 2015 at 02:05:13PM +0000, 'Helga Velroyen' via ganeti-devel wrote: > commit 64a924d53c56fc659f32ba022ec69e2b6a660468 > Merge: bacd275 0de1e68 > Author: Helga Velroyen <[email protected]> > Date: Thu Apr 23 15:59:50 2015 +0200 > > Merge branch 'stable-2.12' into stable-2.13 > > * stable-2.12 > When assigning UUIDs to disks, do so recursively > Fix sample 2.11 configuration > Include hypervisor parameters in SSConf > Add SSConf keys for hypervisor parameters > Use Hypervisor as the key in ClusterHvParams > Re-remove final config update in renew-crypto > Fix string formatting in private object representation > Fix the computation of the list of reserved IP addresses > > * stable-2.11 > Update configure file to version 2.11.7 > Update NEWS file for 2.11.7 release > Add logging to RenewCrypto > Fix format string for gnt-network info > Replace textwrapper.wrap by a custom version for networks > Add SSL improvements to NEWS file > > * stable-2.10 > Update tag limitations > Fix typos in doc/design-storagetypes.rst > Make getFQDN prefer cluster protocol family > Add version of getFQDN accepting preferences > Make getFQDN honor vcluster > > Conflicts: > lib/cmdlib/cluster.py > > Resolution: > lib/cmdlib/cluster.py: take addition from 2.12
LGTM -- Klaus Aehlig Google Germany GmbH, Dienerstr. 12, 80331 Muenchen Registergericht und -nummer: Hamburg, HRB 86891 Sitz der Gesellschaft: Hamburg Geschaeftsfuehrer: Graham Law, Christine Elizabeth Flores
