For 0.14.1 I actually didn't need to create a branch and cherry-pick changes, since it included everything which was in trunk at that point in time.
On Fri, May 30, 2014 at 12:14 PM, sebgoa <[email protected]> wrote: > > On May 30, 2014, at 11:59 AM, Tomaz Muraus <[email protected]> wrote: > > > Yeah, since we don't always have point releases, I usually don't > > immediately create a branch for each 0.x release series. > > > > I usually create it when we decide to roll out next point release in the > > current release series. This is also why I said 0.14.2 branch should be > > based on the v0.14.1 tag. > > ok, but there is a v0.14.0 tag. Did you create a branch and cherry pick to > get the v0.14.1 ? > then delete the branch. > > > > > > > On Fri, May 30, 2014 at 11:49 AM, sebgoa <[email protected]> wrote: > > > >> > >> On May 30, 2014, at 11:45 AM, Tomaz Muraus <[email protected]> wrote: > >> > >>> Great. > >>> > >>> In this case we should do the following: > >>> > >>> 1. Create 0.14.2 branch based on the v0.14.1 tag > >> > >> I was checking this and there is actually no 0.14.1 branch, there is no > >> 0.14.0 branch either. > >> > >> is that normal ? I see the 0.13.x branches > >> > >>> > >>> 2. Cherry pick all the bug fixes we want in this release from trunk > onto > >>> 0.14.2 branch. I'm usually pretty diligent while merging patches and > make > >>> sure I squash all the commits which should make cherry picking easier, > >> but > >>> cherry picking might still result in some conflicts which will need to > be > >>> resolved manually. Also keep in mind that this is a bug-fix only > release > >> so > >>> we should only include bug fixes. > >>> > >> > >> > >>> 3. Update CHANGES.rst for 0.14.2 > >>> > >>> 4. ... > >>> > >>> Details instructions for preparing a release are available at > >>> > >> > https://libcloud.readthedocs.org/en/latest/committer_guide.html#making-a-release-for-release-managers > >> . > >>> Sadly the whole process still involves manual steps so we should > schedule > >>> some time together on Monday and make sure everything goes smoothly (on > >> top > >>> of that, I still need to add your key to KEYS file)... > >>> > >>> > >>> On Fri, May 30, 2014 at 9:08 AM, Sebastien Goasguen <[email protected]> > >>> wrote: > >>> > >>>> > >>>> On May 26, 2014, at 5:31 PM, Tomaz Muraus <[email protected]> wrote: > >>>> > >>>>> Hey, > >>>>> > >>>>> We have two options: > >>>>> > >>>>> 1. Create bug-fix only 0.14.2 release with this and potentially some > >>>> other > >>>>> bug fixes (?) > >>>>> > >>>> > >>>> I am game to prepare a 0.14.2 release on Monday. > >>>> > >>>> If everyone checks the CHANGES file to make sure their important > changes > >>>> are listed, that would be great. > >>>> > >>>> > >>>>> 2. Create 0.15.0 release with all the changes which have accumulated > in > >>>> the > >>>>> trunk. > >>>>> > >>>>> Option #2 should be OK, since, IIRC, there is only one minor semi > >>>>> backward-incompatible change in the trunk which still needs to be > >>>>> documented in the release notes. > >>>>> > >>>>> This change is related to ParamikoSSHClient which is used internally > by > >>>>> Libcloud so not a lot of users should be affected: > >>>>> > >>>>> P.S. Sebastien - can you please update CHANGES.rst with information > >> about > >>>>> your bug fix? > >>>>> > >>>>> > >>>>> On Mon, May 26, 2014 at 8:11 PM, sebgoa <[email protected]> wrote: > >>>>> > >>>>>> Hi, > >>>>>> > >>>>>> Today I fixed a small error/regression in the cloudstack driver that > >>>> could > >>>>>> cause lots of trouble: > >>>>>> https://issues.apache.org/jira/browse/LIBCLOUD-566 > >>>>>> > >>>>>> I am not sure how I did not see it in previous votes, but I would be > >> +1 > >>>> to > >>>>>> release a new version with this fix. > >>>>>> > >>>>>> thoughts ? > >>>>>> > >>>>>> -Sebastien > >>>> > >>>> > >> > >> > >
