This is an interdiff to the first patch only (ignore the first interdiff): diff --git a/NEWS b/NEWS index 0e3b848..4279d53 100644 --- a/NEWS +++ b/NEWS @@ -7,7 +7,16 @@ Version 2.11.2
*(Released Fri, 13 Jun 2014)* -- Improvements to KVM wrt to the kvmd and instance shutdown behavior +- Improvements to KVM wrt to the kvmd and instance shutdown behavior. + WARNING: In contrast to our standard policy, this bug fix update + introduces new parameters to the configuration. This means in + particular that after an upgrade from 2.11.0 or 2.11.1, 'cfgupgrade' + needs to be run, either manually or explicitly by running + 'gnt-cluster upgrade --to 2.11.2' (which requires that they + had configured the cluster with --enable-full-version). + This also means, that it is not easily possible to downgrade from + 2.11.2 to 2.11.1 or 2.11.0. The only way is to go back to 2.10 and + back. Inherited from the 2.10 branch: On Thu, Jun 12, 2014 at 11:57 AM, Petr Pudlák <[email protected]> wrote: > As just mentioned by Klaus offline, it's not possible to go back from > 2.11.2 to to 2.11.*, because of the additional parameters! (The only way is > to go to 2.10 and then back.) So there should be a big warning about that > as well. > > > On Thu, Jun 12, 2014 at 11:54 AM, Helga Velroyen <[email protected]> > wrote: > >> Is that an LGTM then? ;) Or do you want me to extend the explanation with >> that? >> >> >> On Thu, Jun 12, 2014 at 11:53 AM, Petr Pudlák <[email protected]> wrote: >> >>> Upgrading from 2.11.* to 2.11.2 should be performed automatically the >>> first time the configuration is loaded, without the need to run it manually >>> (which has been tested). But anyway, asking users to run the upgrade is a >>> safer way and does no harm. >>> >>> >>> On Thu, Jun 12, 2014 at 11:49 AM, 'Helga Velroyen' via ganeti-devel < >>> [email protected]> wrote: >>> >>>> Interdiff: >>>> >>>> helgav@magritte:~/ganeti-projects/stable-2.11+prep2112/src$ git diff >>>> diff --git a/NEWS b/NEWS >>>> index 0e3b848..2c10bde 100644 >>>> --- a/NEWS >>>> +++ b/NEWS >>>> @@ -7,7 +7,13 @@ Version 2.11.2 >>>> >>>> *(Released Fri, 13 Jun 2014)* >>>> >>>> -- Improvements to KVM wrt to the kvmd and instance shutdown behavior >>>> +- Improvements to KVM wrt to the kvmd and instance shutdown behavior. >>>> + Note that in contrast to our standard policy, this bug fix update >>>> + introduces new parameters in the configuration. This means in >>>> + particular that after an upgrade from 2.11.0 or 2.11.1, 'cfgupgrade' >>>> + needs to be run, either manually or explicitely by running >>>> + 'gnt-cluster upgrade --to 2.11.2' (which requires that they >>>> + had configured the cluster with --enable-full-version). >>>> >>>> Inherited from the 2.10 branch: >>>> >>>> >>>> >>>> >>>> On Thu, Jun 12, 2014 at 11:37 AM, Klaus Aehlig <[email protected]> >>>> wrote: >>>> >>>>> On Thu, Jun 12, 2014 at 10:52:06AM +0200, 'Helga Velroyen' via >>>>> ganeti-devel wrote: >>>>> > By adding information about what changed since 2.11.1. >>>>> > >>>>> > Signed-off-by: Helga Velroyen <[email protected]> >>>>> > --- >>>>> > NEWS | 18 ++++++++++++++++++ >>>>> > 1 file changed, 18 insertions(+) >>>>> > >>>>> > diff --git a/NEWS b/NEWS >>>>> > index 50bbb8a..0e3b848 100644 >>>>> > --- a/NEWS >>>>> > +++ b/NEWS >>>>> > @@ -2,6 +2,24 @@ News >>>>> > ==== >>>>> > >>>>> > >>>>> > +Version 2.11.2 >>>>> > +-------------- >>>>> > + >>>>> > +*(Released Fri, 13 Jun 2014)* >>>>> > + >>>>> > +- Improvements to KVM wrt to the kvmd and instance shutdown behavior >>>>> >>>>> I think we should warn the users that, as opposed to our standard >>>>> policy(!), >>>>> new parameters were introduced to the configuration. In particular, >>>>> users >>>>> who are upgrading from 2.11.0 or 2.11.1 need to run cfgupgrade, either >>>>> implictly by 'gnt-cluster upgrade --to 2.11.2' (which requires that >>>>> they >>>>> configure with --enable-full-version) or manually. >>>>> >>>>> -- >>>>> 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 >>>>> >>>> >>>> >>>> >>>> -- >>>> -- >>>> 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 >>>> >>> >>> >> >> >> -- >> -- >> 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 >> > > -- -- 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
