[ovs-dev] branching commits

[Ben Pfaff]

On Tue, Jan 31, 2017 at 05:58:52PM -0800, Justin Pettit wrote:
> 
> > On Jan 31, 2017, at 3:03 PM, Ben Pfaff <blp at ovn.org> wrote:
> > 
> > Hi Justin.  We branched a couple of weeks ago but at the time we forgot
> > to update NEWS, etc. either on master or the branch.  Usually you submit
> > those patches; do you want to do the honors this time too?
> 
> Okay, I sent out patches.  Normally, I do the following patches to
> master: Prepare for the pending release and prepare for the following
> release.  I then cherry-pick the pending release commit to the new
> branch.  Since we already had the branch and some commits went in, I
> just made a single patch directly for each of branch-2.7 and master.
> This means master won't have the "Prepare for 2.7.0" commit.  I don't
> think it matters in practice, but the history will be a bit different
> than usual.

Thanks.  I should have let you do this when we branched.  My bad.