On Fri, Jan 24, 2014 at 2:32 PM, Klaus Aehlig <[email protected]> wrote:
> On Fri, Jan 24, 2014 at 02:24:31PM +0100, Helga Velroyen wrote:
> > With this interdiff, the patch is complete, including maintaining
> > functionality of the upgrade:
> >
> > diff --git a/tools/post-upgrade b/tools/post-upgrade
> > index 6aec3ff..74ade3c 100644
> > --- a/tools/post-upgrade
> > +++ b/tools/post-upgrade
> > @@ -43,11 +43,9 @@ def main():
> > version = utils.version.ParseVersion(versionstring)
> >
> > if utils.version.IsBefore(version, 2, 11, 0):
> > - result = utils.RunCmd(["gnt-cluster", "renew-crypto",
> > - "--new-node-certificates", "-f"])
> > - if result.failed:
> > - cli.ToStderr("Failed to create node certificates: %s; Output %s" %
> > - (result.fail_reason, result.output))
> > + # FIXME: Add client certificate handling here when resolving issue
> 692.
> > + pass
> > +
> > return 0
> >
> > if __name__ == "__main__":
> >
>
> LGTM :-(
>
> But please consider also changing the UPGRADE notes accordingly, i.e.,
> removing the 2.11 section (starting with "When upgrading to 2.11,
> first...").
> No need to resend, if you decide to include removing lines 32--45 of
> UPGRADE
> into this patch.
>
Sure, I'll include the changes in the UPGRADE file here as well.
Thanks,
Helga
>
> --
> 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
