LGTM, thanks On Thu, Mar 26, 2015 at 4:42 PM, 'Klaus Aehlig' via ganeti-devel < [email protected]> wrote:
> > > commit 0e0e58df89a50c48025f7b897f0c2f7371446711 > Merge: dbfbb71 0503112 > Author: Klaus Aehlig <[email protected]> > Date: Thu Mar 26 16:38:43 2015 +0100 > > Merge branch 'stable-2.14' into master > > * stable-2.14 > Suffix bump for 2.14.0~beta2 > Update NEWS for 2.14.0 beta2 > > * stable-2.13 > Bump version suffix up to ~rc1 > Update NEWS file > Add missing news about disk conversion > > * stable-2.12 > Revision bump to 2.12.2 > Update NEWS for 2.12.2 > > Conflicts: > NEWS (take all additions) > configure.ac (ignore suffix bump) > > Signed-off-by: Klaus Aehlig <[email protected]> > > diff --cc NEWS > index ec616b5,a207f0e..7a99e38 > --- a/NEWS > +++ b/NEWS > @@@ -2,38 -2,10 +2,38 @@@ New > ==== > > > +Version 2.15.0 > +-------------- > + > +*(unreleased)* > + > +Incompatible/important changes > +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > + > +- In order to improve allocation efficiency when using DRBD, the cluster > + metric now takes the total reserved memory into account. A consequence > + of this change is that the best possible cluster metric is no longer 0. > + htools(1) interprets minimal cluster scores to be offsets of the > theoretical > + lower bound, so only users interpreting the cluster score directly > should > + be affected. > + > +New features > +~~~~~~~~~~~~ > + > +New dependencies > +~~~~~~~~~~~~~~~~ > + > +- The indirect dependency on Haskell package 'case-insensitive' is now > + explicit. > + > +Known issues > +~~~~~~~~~~~~ > + > + > - Version 2.14.0 beta1 > + Version 2.14.0 beta2 > -------------------- > > - *(Released Fri, 13 Feb 2015)* > + *(Released Thu, 26 Mar 2015)* > > New features > ~~~~~~~~~~~~ > > > -- > 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 > Hrvoje Ribicic Ganeti Engineering Google Germany GmbH Dienerstr. 12, 80331, München Registergericht und -nummer: Hamburg, HRB 86891 Sitz der Gesellschaft: Hamburg Geschäftsführer: Graham Law, Christine Elizabeth Flores Steuernummer: 48/725/00206 Umsatzsteueridentifikationsnummer: DE813741370
