pulled that pr in and am testing build after fixing conflict. If it seems ok will merge.
But no the intent isn't to grab things from the PR pile between RCs. The community should always work to merge in features/fixes/etc.. and we should also work to generate releases. Thanks On Mon, Oct 28, 2019 at 11:31 AM Mike Thomsen <mikerthom...@gmail.com> wrote: > Joe/Andy, > > Should we include this one bug fix that a user recently needed for an > Elastic/Apache HttpClient SSL bug? > > https://github.com/apache/nifi/pull/3828 > > On Mon, Oct 28, 2019 at 2:11 PM Joe Witt <joe.w...@gmail.com> wrote: > > > Team, > > > > Please be careful in JIRA to mark new things merged to master as fixed > for > > 1.11. > > > > The 1.10 release is now in release candidate stage and therefore going to > > master is for the next release line. If appropriate/able the release > > manager (in this case me) will pull it into the 1.10 release and I'll tag > > the JIRA appropriately. All current JIRAs marked 1.10 are correct I > > believe and i'll make rc3 now off latest master commit but please don't > > mark anything else 1.10. I'll do it if necessary. > > > > Thanks > > >
