+1. Let's get rid of the 2 branch policy. I think we can now technically force-push to all branches, but we should probably still avoid it. Please go ahead and sync 1.7 with trunk.
On Wed, Jul 13, 2016 at 1:11 PM Mike Percy <mpe...@apache.org> wrote: > On Wed, Jul 13, 2016 at 1:08 PM, Mike Percy <mpe...@apache.org> wrote: > > > > PS: In the meantime, I will cherry-pick all of my recent commits to the > > flume-1.7 branch. I just don't think we should create a flume-1.8 branch > > once we release Flume 1.7.0 > > > > Actually, my preference would be to force-push the flume-1.7 branch so that > it exactly matches trunk. IIRC, the only branch we cannot force-push is > trunk, unless that ASF git configuration has changed recently. > > Mike >
