Hey Folks,

It's been a week since we last talked about the 3.1.0 release.

So I guess we'll only leave out the RPC-related commit from Michael.

Is it OK if I start the branching and testing tomorrow?
Then, I'll cherry-pick the docs-related changes from Alex after they land
in the repo.

Or, do you prefer to wait with the branching until the docs-related changes
are made?
This way we'll have more changes in the release.

BR,
    Zoltan



On Tue, Nov 6, 2018 at 4:23 PM Zoltan Borok-Nagy <borokna...@cloudera.com>
wrote:

> Thanks for the suggestions.
> I wasn't aware of interactive git rebase. It might makes it simpler to
> carry out (a) if there are no conflicts.
>
> Zoltan
>
> On Tue, Nov 6, 2018 at 4:06 PM Jim Apple <jbap...@cloudera.com> wrote:
>
>> >
>> > I just have a technical question about it. Should we
>> > a) select an early branching point then do a lot of cherry picks for the
>> > commits we want in and leave out the risky ones
>> > b) select a recent branching point then revert the risky commits on the
>> > release branch
>> >
>>
>> I think (a) is easier for someone who is doing some git work on the
>> branch,
>> but our branches tend to be used once for releases and then rarely touched
>> again, so it's not a disaster to do (b).
>>
>

Reply via email to