On Mon, May 04, 2015 at 03:33:06PM +0200, 'Klaus Aehlig' via ganeti-devel wrote:

commit ec9126e74fe0c75410c162b429ec3c746c8a588b
Merge: b60b6ab ff3f66b
Author: Klaus Aehlig <[email protected]>
Date:   Mon May 4 15:26:36 2015 +0200

   Merge branch 'stable-2.15' into master

   * stable-2.15
     QA: use relative path to script location for burnin
     Prepare release of 2.15.0~beta1 for today
     Remove superflouos ~rc1
     Undoing release preparations for 2.15~beta1

   * 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

   Signed-off-by: Klaus Aehlig


--
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

LGTM

Reply via email to