Re: Backporting a patch to a release branch

Sure, porting it is not an issue. At my current status I actually have to port it to the master (as I've written it based on the 1.0.x release branch), but fortunately it's not a lot of code. Thanks for the feedback as well! On Wed, Apr 27, 2016 at 3:35 PM, Maximilian Michels wrote: > Hi Stefano

Re: Backporting a patch to a release branch

Hi Stefano, It is a bit unfortunate for you that you have to spend additional time to port your code to a different branch. A PR is the way to go if a commit can't be simply cherry-picked. If your changes are too major then it is probably good idea just to include them in the next major release.

Re: Backporting a patch to a release branch

Ok, thanks for the feedback. On Wed, Apr 27, 2016 at 3:16 PM, Till Rohrmann wrote: > Hi Stefano, > > in this case I think it's best if you opened a PR against the release > branch so that a committer can pull it in. > > Cheers, > Till > > On Wed, Apr 27, 2016 at 3:03 PM, Stefano Baghino < > stef

Re: Backporting a patch to a release branch

Hi Stefano, in this case I think it's best if you opened a PR against the release branch so that a committer can pull it in. Cheers, Till On Wed, Apr 27, 2016 at 3:03 PM, Stefano Baghino < stefano.bagh...@radicalbit.io> wrote: > Hi Ufuk, > > thanks for getting back to me, I understand. > The pr

Re: Backporting a patch to a release branch

Hi Ufuk, thanks for getting back to me, I understand. The problem with this patch in particular is that the code would be slightly different between the 1.0.x and 1.1.x, so cherry-picking the commit from the master branch to the release branch wouldn't be a viable option, unfortunately. In this ca

Re: Backporting a patch to a release branch

Hi, I think what we did for now is this: When merging a PR onto the master that we also consider to be required in a future release of an older release branch we cherry-pick it there and make the required changes. This only works for committers, of course, since we can just do that. I think in you

Backporting a patch to a release branch

I'm currently working on FLINK-3239 (support Kerberos on the Kafka connector). I almost have a working prototype, however now I have a doubt regarding how to properly merge my code (when done): right now I'm working on a branch out of the 1.0.x re