You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@phoenix.apache.org by James Taylor <ja...@apache.org> on 2015/04/27 19:16:57 UTC
[DISCUSS] branch names
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?
Re: [DISCUSS] branch names
Posted by James Taylor <ja...@apache.org>.
+1. Thanks, Rajeshbabu.
On Tue, Apr 28, 2015 at 7:03 PM, rajeshbabu@apache.org
<ch...@gmail.com> wrote:
> Hi Team,
>
> Here is the plan for branch names(Just reiterating what ever James
> suggested):
>
> 1) As HBase 1.1.0 release may take 1 or 2 weeks currently we can delete
> 4.4-HBase-1.1 branch as James mentioned. We can target it for 4.4.1 release.
> Today I will delete the branch if no objections.
>
> 2) rename the 4.4-HBase-1.0 branch to 4.x-HBase-1.0.
> Create 4.x-HBase-1.0 branch from 4.4-HBase-1.0 and delete 4.4-HBase-1.0.
> Will do it today.
>
> 3) RC can be created from 4.x-HBase-1.0 and 4.4-HBase-1.0 can be created
> just
> before RC going to pass to avoid overhead of committing to two branches.
>
> Is that ok?
>
> Thanks,
> Rajeshbabu.
>
> On Tue, Apr 28, 2015 at 11:37 PM, Nick Dimiduk <nd...@gmail.com> wrote:
>
>> FYI, HBase 1.1.0 is imminent. I will push another snapshot jar today that's
>> very close, and hope to have rc0 up Wednesday (tomorrow).
>>
>> On Mon, Apr 27, 2015 at 12:20 PM, James Taylor <ja...@apache.org>
>> wrote:
>>
>> > Do you agree we need to create a 4.x-HBase-1.0 branch now? If not,
>> > what branch will be used to check-in work for 4.5? The reason *not* to
>> > create the 4.4-HBase-1.0 branch now is that every check-in needs to be
>> > merged with *both* a 4.x-HBase-1.0 branch and the 4.4-HBase-1.0
>> > branch. This is wasted effort until the branches diverge (which I
>> > suspect they won't until after the 4.4 release).
>> >
>> > Thanks,
>> > James
>> >
>> > On Mon, Apr 27, 2015 at 12:13 PM, rajeshbabu@apache.org
>> > <ch...@gmail.com> wrote:
>> > >>
>> > >>- 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
>> > >>
>> > > I agree with this Enis and but I too feel create 4.4-HBase-1.0 before
>> RC
>> > is
>> > > better than before RC vote is going to pass.
>> > >
>> > > Thanks,
>> > > Rajeshbabu.
>> > >
>> > > On Tue, Apr 28, 2015 at 12:30 AM, Enis Söztutar <en...@gmail.com>
>> > wrote:
>> > >
>> > >> >
>> > >> >
>> > >> > My proposal would be:
>> > >> > - delete the 4.4-HBase-1.1 branch and do this work in master.
>> > >> >
>> > >>
>> > >> Sounds good. We will not have 4.4 release for HBase-1.1.0 until HBase
>> > >> release is done. Rajesh what do you think?
>> > >>
>> > >> - rename the 4.4-HBase-1.0 branch to 4.x-HBase-1.0.
>> > >> >
>> > >>
>> > >> +1.
>> > >>
>> > >>
>> > >> > - 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.
>> > >> >
>> > >>
>> > >> I think the RC has to be cut from the branch after forking. That is
>> the
>> > >> cleanest approach IMO. Creating the fork, just before cutting the RC
>> is
>> > >> equal amounts of work.
>> > >>
>> > >>
>> > >> >
>> > >> > Thanks,
>> > >> > James
>> > >> >
>> > >> > On Mon, Apr 27, 2015 at 11:30 AM, Enis Söztutar <en...@apache.org>
>> > 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 <
>> > jamestaylor@apache.org
>> > >> >
>> > >> > > 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?
>> > >> > >>
>> > >> >
>> > >>
>> >
>>
Re: [DISCUSS] branch names
Posted by "rajeshbabu@apache.org" <ch...@gmail.com>.
Hi Team,
Here is the plan for branch names(Just reiterating what ever James
suggested):
1) As HBase 1.1.0 release may take 1 or 2 weeks currently we can delete
4.4-HBase-1.1 branch as James mentioned. We can target it for 4.4.1 release.
Today I will delete the branch if no objections.
2) rename the 4.4-HBase-1.0 branch to 4.x-HBase-1.0.
Create 4.x-HBase-1.0 branch from 4.4-HBase-1.0 and delete 4.4-HBase-1.0.
Will do it today.
3) RC can be created from 4.x-HBase-1.0 and 4.4-HBase-1.0 can be created
just
before RC going to pass to avoid overhead of committing to two branches.
Is that ok?
Thanks,
Rajeshbabu.
On Tue, Apr 28, 2015 at 11:37 PM, Nick Dimiduk <nd...@gmail.com> wrote:
> FYI, HBase 1.1.0 is imminent. I will push another snapshot jar today that's
> very close, and hope to have rc0 up Wednesday (tomorrow).
>
> On Mon, Apr 27, 2015 at 12:20 PM, James Taylor <ja...@apache.org>
> wrote:
>
> > Do you agree we need to create a 4.x-HBase-1.0 branch now? If not,
> > what branch will be used to check-in work for 4.5? The reason *not* to
> > create the 4.4-HBase-1.0 branch now is that every check-in needs to be
> > merged with *both* a 4.x-HBase-1.0 branch and the 4.4-HBase-1.0
> > branch. This is wasted effort until the branches diverge (which I
> > suspect they won't until after the 4.4 release).
> >
> > Thanks,
> > James
> >
> > On Mon, Apr 27, 2015 at 12:13 PM, rajeshbabu@apache.org
> > <ch...@gmail.com> wrote:
> > >>
> > >>- 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
> > >>
> > > I agree with this Enis and but I too feel create 4.4-HBase-1.0 before
> RC
> > is
> > > better than before RC vote is going to pass.
> > >
> > > Thanks,
> > > Rajeshbabu.
> > >
> > > On Tue, Apr 28, 2015 at 12:30 AM, Enis Söztutar <en...@gmail.com>
> > wrote:
> > >
> > >> >
> > >> >
> > >> > My proposal would be:
> > >> > - delete the 4.4-HBase-1.1 branch and do this work in master.
> > >> >
> > >>
> > >> Sounds good. We will not have 4.4 release for HBase-1.1.0 until HBase
> > >> release is done. Rajesh what do you think?
> > >>
> > >> - rename the 4.4-HBase-1.0 branch to 4.x-HBase-1.0.
> > >> >
> > >>
> > >> +1.
> > >>
> > >>
> > >> > - 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.
> > >> >
> > >>
> > >> I think the RC has to be cut from the branch after forking. That is
> the
> > >> cleanest approach IMO. Creating the fork, just before cutting the RC
> is
> > >> equal amounts of work.
> > >>
> > >>
> > >> >
> > >> > Thanks,
> > >> > James
> > >> >
> > >> > On Mon, Apr 27, 2015 at 11:30 AM, Enis Söztutar <en...@apache.org>
> > 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 <
> > jamestaylor@apache.org
> > >> >
> > >> > > 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?
> > >> > >>
> > >> >
> > >>
> >
>
Re: [DISCUSS] branch names
Posted by Nick Dimiduk <nd...@gmail.com>.
FYI, HBase 1.1.0 is imminent. I will push another snapshot jar today that's
very close, and hope to have rc0 up Wednesday (tomorrow).
On Mon, Apr 27, 2015 at 12:20 PM, James Taylor <ja...@apache.org>
wrote:
> Do you agree we need to create a 4.x-HBase-1.0 branch now? If not,
> what branch will be used to check-in work for 4.5? The reason *not* to
> create the 4.4-HBase-1.0 branch now is that every check-in needs to be
> merged with *both* a 4.x-HBase-1.0 branch and the 4.4-HBase-1.0
> branch. This is wasted effort until the branches diverge (which I
> suspect they won't until after the 4.4 release).
>
> Thanks,
> James
>
> On Mon, Apr 27, 2015 at 12:13 PM, rajeshbabu@apache.org
> <ch...@gmail.com> wrote:
> >>
> >>- 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
> >>
> > I agree with this Enis and but I too feel create 4.4-HBase-1.0 before RC
> is
> > better than before RC vote is going to pass.
> >
> > Thanks,
> > Rajeshbabu.
> >
> > On Tue, Apr 28, 2015 at 12:30 AM, Enis Söztutar <en...@gmail.com>
> wrote:
> >
> >> >
> >> >
> >> > My proposal would be:
> >> > - delete the 4.4-HBase-1.1 branch and do this work in master.
> >> >
> >>
> >> Sounds good. We will not have 4.4 release for HBase-1.1.0 until HBase
> >> release is done. Rajesh what do you think?
> >>
> >> - rename the 4.4-HBase-1.0 branch to 4.x-HBase-1.0.
> >> >
> >>
> >> +1.
> >>
> >>
> >> > - 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.
> >> >
> >>
> >> I think the RC has to be cut from the branch after forking. That is the
> >> cleanest approach IMO. Creating the fork, just before cutting the RC is
> >> equal amounts of work.
> >>
> >>
> >> >
> >> > Thanks,
> >> > James
> >> >
> >> > On Mon, Apr 27, 2015 at 11:30 AM, Enis Söztutar <en...@apache.org>
> 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 <
> jamestaylor@apache.org
> >> >
> >> > > 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?
> >> > >>
> >> >
> >>
>
Re: [DISCUSS] branch names
Posted by James Taylor <ja...@apache.org>.
Do you agree we need to create a 4.x-HBase-1.0 branch now? If not,
what branch will be used to check-in work for 4.5? The reason *not* to
create the 4.4-HBase-1.0 branch now is that every check-in needs to be
merged with *both* a 4.x-HBase-1.0 branch and the 4.4-HBase-1.0
branch. This is wasted effort until the branches diverge (which I
suspect they won't until after the 4.4 release).
Thanks,
James
On Mon, Apr 27, 2015 at 12:13 PM, rajeshbabu@apache.org
<ch...@gmail.com> wrote:
>>
>>- 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
>>
> I agree with this Enis and but I too feel create 4.4-HBase-1.0 before RC is
> better than before RC vote is going to pass.
>
> Thanks,
> Rajeshbabu.
>
> On Tue, Apr 28, 2015 at 12:30 AM, Enis Söztutar <en...@gmail.com> wrote:
>
>> >
>> >
>> > My proposal would be:
>> > - delete the 4.4-HBase-1.1 branch and do this work in master.
>> >
>>
>> Sounds good. We will not have 4.4 release for HBase-1.1.0 until HBase
>> release is done. Rajesh what do you think?
>>
>> - rename the 4.4-HBase-1.0 branch to 4.x-HBase-1.0.
>> >
>>
>> +1.
>>
>>
>> > - 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.
>> >
>>
>> I think the RC has to be cut from the branch after forking. That is the
>> cleanest approach IMO. Creating the fork, just before cutting the RC is
>> equal amounts of work.
>>
>>
>> >
>> > Thanks,
>> > James
>> >
>> > On Mon, Apr 27, 2015 at 11:30 AM, Enis Söztutar <en...@apache.org> 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 <jamestaylor@apache.org
>> >
>> > > 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?
>> > >>
>> >
>>
Re: [DISCUSS] branch names
Posted by "rajeshbabu@apache.org" <ch...@gmail.com>.
>
>- 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
>
I agree with this Enis and but I too feel create 4.4-HBase-1.0 before RC is
better than before RC vote is going to pass.
Thanks,
Rajeshbabu.
On Tue, Apr 28, 2015 at 12:30 AM, Enis Söztutar <en...@gmail.com> wrote:
> >
> >
> > My proposal would be:
> > - delete the 4.4-HBase-1.1 branch and do this work in master.
> >
>
> Sounds good. We will not have 4.4 release for HBase-1.1.0 until HBase
> release is done. Rajesh what do you think?
>
> - rename the 4.4-HBase-1.0 branch to 4.x-HBase-1.0.
> >
>
> +1.
>
>
> > - 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.
> >
>
> I think the RC has to be cut from the branch after forking. That is the
> cleanest approach IMO. Creating the fork, just before cutting the RC is
> equal amounts of work.
>
>
> >
> > Thanks,
> > James
> >
> > On Mon, Apr 27, 2015 at 11:30 AM, Enis Söztutar <en...@apache.org> 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 <jamestaylor@apache.org
> >
> > > 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?
> > >>
> >
>
Re: [DISCUSS] branch names
Posted by Enis Söztutar <en...@gmail.com>.
>
>
> My proposal would be:
> - delete the 4.4-HBase-1.1 branch and do this work in master.
>
Sounds good. We will not have 4.4 release for HBase-1.1.0 until HBase
release is done. Rajesh what do you think?
- rename the 4.4-HBase-1.0 branch to 4.x-HBase-1.0.
>
+1.
> - 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.
>
I think the RC has to be cut from the branch after forking. That is the
cleanest approach IMO. Creating the fork, just before cutting the RC is
equal amounts of work.
>
> Thanks,
> James
>
> On Mon, Apr 27, 2015 at 11:30 AM, Enis Söztutar <en...@apache.org> 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 <ja...@apache.org>
> > 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?
> >>
>
Re: [DISCUSS] branch names
Posted by Cody Marcel <cm...@salesforce.com>.
+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 <ja...@apache.org>
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 <en...@apache.org> 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 <ja...@apache.org>
> > 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?
> >>
>
Re: [DISCUSS] branch names
Posted by James Taylor <ja...@apache.org>.
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 <en...@apache.org> 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 <ja...@apache.org>
> 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?
>>
Re: [DISCUSS] branch names
Posted by Enis Söztutar <en...@apache.org>.
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 <ja...@apache.org>
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?
>