+1 Delaying the branching until we get closer to an RC will also help to minimize the number of branches we have to keep in sync.
On Mon, Apr 27, 2015 at 11:40 AM, James Taylor <[email protected]> wrote: > I think we should adjust the branch structure prior to the 4.4 > release. IMO, our master branch should function against the latest > HBase release we're working on supporting, (i.e. what is the > 4.4-HBase-1.1 branch now). I think it might be too early to have a > 4.4-HBase-1.1 as there's no HBase 1.1 release yet. > > My proposal would be: > - delete the 4.4-HBase-1.1 branch and do this work in master. > - rename the 4.4-HBase-1.0 branch to 4.x-HBase-1.0. > - create the 4.4-HBase-1.0 branch off of 4.x-HBase-1.0 a bit later > (when it looks like an RC is going to pass) and warn folks not to > commit JIRAs not approved by the RM while the voting is going on. > > Thanks, > James > > On Mon, Apr 27, 2015 at 11:30 AM, Enis Söztutar <[email protected]> wrote: > > I think, it depends on whether we want master to have 5.0.0-SNAPSHOT > > version or 4.5.0-SNAPSHOT version and whether we want 4.5 and further > > releases for HBase-1.0.x series. Personally, I would love to see at least > > one release of Phoenix for 1.0.x, but it is fine if Phoenix decides to > only > > do 4.4 for HBase-1.0 and 4.5 for 1.1. > > > > If we want to have a place for 5.0.0-SNAPSHOT, you are right that we > should > > do 4.x-HBase-1.0 branch, and fork 4.4-HBase-1.0 branch from there. I > guess, > > Rajesh's creating of 4.4 branch is for preparing for the 4.4 soon. > > > > Enis > > > > On Mon, Apr 27, 2015 at 10:16 AM, James Taylor <[email protected]> > > wrote: > > > >> I think the 4.4-HBase-1.0 and 4.4-HBase-1.1 are misnamed and we're > >> making the same mistake we did before by calling our branch 4.0. Once > >> the 4.4 release goes out and we're working on 4.5, we're going to have > >> to check 4.5 work into the 4.4-HBase-1.0 and 4.4-HBase-1.1 branches > >> (which is confusing). > >> > >> Instead, we should name the branches 4.x-HBase-1.0 and 4.x-HBase-1.1. > >> When we're ready to release, we can create a 4.4 branch from each of > >> these branches and the 4.x-HBase-1.0 and 4.x-HBase-1.1 will continue > >> to be used for 4.5. If we plan on patch releases to 4.4, they'd be > >> made out of the 4.4 branch. > >> > >> Thoughts? > >> >
