Yes, it resurrected itself. :-) That'd be good if you could delete that branch to avoid any confusion.
On Wed, Jul 1, 2015 at 11:21 AM, Nick Dimiduk <[email protected]> wrote: > On Tue, Jun 30, 2015 at 7:07 PM, James Taylor <[email protected]> > wrote: > > > Nick - looks like the 4.x-HBase-1.1 branch is back. Do you think we need > > this branch currently? > > > > Oops, is that my mistake? No, I think we agreed that master branch is the > equivalent of 4.x-hbase-1.1. > > On Mon, Jun 29, 2015 at 7:04 PM, Enis Söztutar <[email protected]> wrote: > > > > > Should we also drop 1.0 branch and support only HBase-1.1+ in Phoenix > > 4.5+ > > > ? > > > > > > HBase-1.0 users have 4.4.x releases to use. It should be fair to > require > > a > > > minor HBase upgrade for a minor Phoenix version upgrade. > > > > > > Enis > > > > > > On Mon, Jun 22, 2015 at 9:18 AM, James Taylor <[email protected]> > > > wrote: > > > > > > > Ok, I'll drop the branch tomorrow then. Thanks, > > > > > > > > James > > > > > > > > On Mon, Jun 22, 2015 at 9:16 AM, Nick Dimiduk <[email protected]> > > > wrote: > > > > > Yeah, I guess it's fine, +1. > > > > > > > > > > On Mon, Jun 22, 2015 at 8:50 AM, Cody Marcel < > [email protected] > > > > > > > wrote: > > > > > > > > > >> +1 to removing. > > > > >> > > > > >> On Sun, Jun 21, 2015 at 2:14 PM, Samarth Jain <[email protected] > > > > > > wrote: > > > > >> > > > > >> > +1 to removing 4.x-HBase-1.1 branch and recreating it later from > > > > master, > > > > >> if > > > > >> > needed. Another feature that isn't on that branch because other > > > > commits > > > > >> > were missing is PHOENIX-1504. > > > > >> > > > > > >> > On Sunday, June 21, 2015, James Taylor <[email protected]> > > > > wrote: > > > > >> > > > > > >> > > Nick - based on your last email, I wasn't sure if you meant > > you're > > > > ok > > > > >> > > or not with the 4.x-HBase-1.1 branch being dropped. It's > getting > > > > >> > > further and further behind master and we can always re-create > it > > > > from > > > > >> > > master if we need it down-the-road. > > > > >> > > > > > > >> > > On Thu, Jun 18, 2015 at 1:28 PM, Nick Dimiduk < > > [email protected] > > > > >> > > <javascript:;>> wrote: > > > > >> > > > Fair point, commits should be starting at master and working > > > their > > > > >> way > > > > >> > > > back. We'll still need to verify that all the 4.x branches > > have > > > > the > > > > >> > same > > > > >> > > > patches as master. > > > > >> > > > > > > > >> > > > On Thu, Jun 18, 2015 at 12:09 PM, James Taylor < > > > > >> [email protected] > > > > >> > > <javascript:;>> > > > > >> > > > wrote: > > > > >> > > > > > > > >> > > >> I don't know how to verify they have the same patches, but > > why > > > > would > > > > >> > > >> master be missing commits from the 4.x-HBase-1.1 branch? > > > > >> > > >> > > > > >> > > >> I do see commits missing from the 4.x-HBase-1.1 branch, > > though. > > > > >> When I > > > > >> > > >> run the unit tests on this branch after adding some of the > > > > missing > > > > >> > > >> commits, I get failures while the tests pass fine in > master. > > > > >> > > >> > > > > >> > > >> I don't see any value in spending time figuring this out as > > > > there's > > > > >> > > >> really no need to have the 4.x-HBase-1.1 branch at this > point > > > in > > > > >> time. > > > > >> > > >> This branch is only getting further behind master at this > > > point. > > > > >> > > >> > > > > >> > > >> If you want to spend time figuring it out, then I'll wait > to > > > drop > > > > >> the > > > > >> > > >> branch. Just let me know when you're ok with it. > > > > >> > > >> > > > > >> > > >> Thanks, > > > > >> > > >> James > > > > >> > > >> > > > > >> > > >> On Thu, Jun 18, 2015 at 11:45 AM, Nick Dimiduk < > > > > [email protected] > > > > >> > > <javascript:;>> wrote: > > > > >> > > >> > I'd feel better if a check was done to verify they carry > > the > > > > same > > > > >> > > >> patches. > > > > >> > > >> > > > > > >> > > >> > I'd also like this to be followed up with a discussion > > about > > > > fix > > > > >> > > versions > > > > >> > > >> > in JIRA and how they relate to git branches. For > instance, > > > > we've > > > > >> had > > > > >> > > >> 5.0.0 > > > > >> > > >> > for ages, but it seems even master will be > > > > >> 4.5.0-SNAPSHOT-HBase-1.1. > > > > >> > > >> Should > > > > >> > > >> > we drop 5.0.0 version from JIRA? > > > > >> > > >> > > > > > >> > > >> > On Thursday, June 18, 2015, James Taylor < > > > > [email protected] > > > > >> > > <javascript:;>> wrote: > > > > >> > > >> > > > > > >> > > >> >> Ok, I'll plan to drop the 4.x-HBase-1.1 branch by EOD > this > > > > >> Friday, > > > > >> > > 6/19. > > > > >> > > >> >> Thanks, > > > > >> > > >> >> James > > > > >> > > >> >> > > > > >> > > >> >> On Thu, Jun 18, 2015 at 6:44 AM, [email protected] > > > > >> > > <javascript:;> <javascript:;> > > > > >> > > >> >> <[email protected] <javascript:;> > <javascript:;>> > > > > wrote: > > > > >> > > >> >> > +1 to drop. > > > > >> > > >> >> > > > > > >> > > >> >> > On Wed, Jun 17, 2015 at 3:08 AM, James Taylor < > > > > >> > > [email protected] <javascript:;> > > > > >> > > >> >> <javascript:;>> > > > > >> > > >> >> > wrote: > > > > >> > > >> >> > > > > > >> > > >> >> >> Until master would diverge from 4.x-HBase-1.1 > branch, I > > > > don't > > > > >> > > think > > > > >> > > >> we > > > > >> > > >> >> >> need it, so I propose we drop it. It's just added > > > overhead > > > > at > > > > >> > this > > > > >> > > >> >> >> point and is missing commits from master as well. > > > > >> > > >> >> >> > > > > >> > > >> >> >> Please let me know if you think we need to keep it > > > around. > > > > >> > > >> >> >> > > > > >> > > >> >> >> Thanks, > > > > >> > > >> >> >> James > > > > >> > > >> >> >> > > > > >> > > >> >> > > > > >> > > >> > > > > >> > > > > > > >> > > > > > >> > > > > > > > > > >
