On Wed, Apr 29, 2015 at 08:03:24AM +0000, 'Helga Velroyen' via ganeti-devel wrote: > commit 113e0f70e50e776e43c2bd234c8cf8d1c28ed863 > Merge: 665d6c0 004b239 > Author: Helga Velroyen <[email protected]> > Date: Wed Apr 29 10:00:25 2015 +0200 > > Merge branch 'stable-2.14' into stable-2.15 > > * stable-2.14 > Suffix bump for 2.14.0~rc1 > Update NEWS for 2.14.0~rc1 > clean up now dead code > writeConfigAndUnlock: only unlock after config write > ConfigLock design: change writeAndUnlock > Distribute doc/design-file-based-disks-ownership.rst > > * stable-2.13 > Rename SSH Update evaluation function more expressively > Using named tuple for node info in ssh file manager > Helper functions to assert key existence for sets of nodes > Add RetryByNumberOfTimes utility function > Suffix bump for 2.13.0 > Update NEWS file for 2.13.0 release > > * stable-2.12 > Revision bump to 2.12.3 > Update NEWS for 2.12.3 > > Conflicts: > NEWS > configure.ac > > Solutions: > NEWS: keep 2.15 entries, change 2.14 from beta2 to rc1 > configure: keep version 2.15.0~alpha1 > > Signed-off-by: Helga Velroyen <[email protected]>
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
