On Thu, Mar 20, 2014 at 10:12 AM, Michele Tartara <[email protected]>wrote:
> On Thu, Mar 20, 2014 at 10:09 AM, Helga Velroyen <[email protected]> > wrote: > > After releasing 2.11.0 rc1 I realized that the order of > > the 2.11 entries in the NEWS file is inconsistent with > > the other releases. The main changes should come first and > > afterwards the smaller changes between the different > > versions. This patch rearranges the entries, but does not > > change the content whatsoever. > > > > Signed-off-by: Helga Velroyen <[email protected]> > > --- > > NEWS | 57 ++++++++++++++++++++++++++++++++------------------------- > > 1 file changed, 32 insertions(+), 25 deletions(-) > > > > diff --git a/NEWS b/NEWS > > index 18e76fd..884a7f9 100644 > > --- a/NEWS > > +++ b/NEWS > > @@ -7,31 +7,6 @@ Version 2.11.0 rc1 > > > > *(Released Thu, 20 Mar 2014)* > > > > -Since 2.11.0 beta1: > > - > > -- Convert int to float when checking config. consistency > > -- Rename compression option in gnt-backup export > > - > > -Inherited from the 2.9 branch: > > - > > -- Fix error introduced during merge > > -- gnt-cluster copyfile: accept relative paths > > - > > -Inherited from the 2.8 branch: > > - > > -- Improve RAPI detection of the watcher > > -- Add patching QA configuration files on buildbots > > -- Enable a timeout for instance shutdown > > -- Allow KVM commands to have a timeout > > -- Allow xen commands to have a timeout > > -- Fix wrong docstring > > - > > - > > -Version 2.11.0 beta1 > > --------------------- > > - > > -*(Released Wed, 5 Mar 2014)* > > - > > Incompatible/important changes > > ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > > > > @@ -76,6 +51,7 @@ New features > > > > New dependencies > > ~~~~~~~~~~~~~~~~ > > + > > The following new dependencies have been added: > > > > For Haskell: > > @@ -85,6 +61,37 @@ For Haskell: > > - ``base64-bytestring`` library ( > http://hackage.haskell.org/package/zlib), > > at least version 1.0.0.0 > > > > +Since 2.11.0 beta1 > > +~~~~~~~~~~~~~~~~~~ > > + > > +This was the first RC release of the 2.11 series. Since 2.10.0 beta1: > > Isn't this supposed to be 2.11.0 beta1? > > Right! Good catch, thanks, see interdiff below. > > + > > +- Convert int to float when checking config. consistency > > +- Rename compression option in gnt-backup export > > + > > +Inherited from the 2.9 branch: > > + > > +- Fix error introduced during merge > > +- gnt-cluster copyfile: accept relative paths > > + > > +Inherited from the 2.8 branch: > > + > > +- Improve RAPI detection of the watcher > > +- Add patching QA configuration files on buildbots > > +- Enable a timeout for instance shutdown > > +- Allow KVM commands to have a timeout > > +- Allow xen commands to have a timeout > > +- Fix wrong docstring > > + > > + > > +Version 2.11.0 beta1 > > +-------------------- > > + > > +*(Released Wed, 5 Mar 2014)* > > + > > +This was the first beta release of the 2.11 series. All important > changes > > +are listed in the latest 2.11 entry. > > + > > > > Version 2.10.1 > > -------------- > > -- > > 1.9.0.279.gdc9e3eb > > > > Rest LGTM, thanks. > > Michele > diff --git a/NEWS b/NEWS index 884a7f9..8cb62a8 100644 --- a/NEWS +++ b/NEWS @@ -64,7 +64,7 @@ For Haskell: Since 2.11.0 beta1 ~~~~~~~~~~~~~~~~~~ -This was the first RC release of the 2.11 series. Since 2.10.0 beta1: +This was the first RC release of the 2.11 series. Since 2.11.0 beta1: - Convert int to float when checking config. consistency - Rename compression option in gnt-backup export > > -- > 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 > -- -- Helga Velroyen | Software Engineer | [email protected] | 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
