Should I then go remove the note part from the CHANGES entry in branch_6_6 ?
* SOLR-11177: CoreContainer.load needs to send lazily loaded core descriptors to the proper list rather than send them all to the transient lists. (Erick Erickson) (note, not in 7.0, is in 7.1) I see a commit for this in branch_7_0 Commit c73b5429b722b09b9353ec82627a35e2b864b823 in lucene-solr's branch refs/heads/branch_7_0 from Erick [ https://git-wip-us.apache.org/repos/asf?p=lucene-solr.git;h=c73b542 ] On Thu, Aug 17, 2017 at 2:48 PM, Erick Erickson <erickerick...@gmail.com> wrote: > Well, it is in 7.0. Everything I moved to 6.6.1 is also in 7.0, or should > be. > > On Thu, Aug 17, 2017 at 2:31 PM, Varun Thacker <va...@vthacker.in> wrote: > > Hi Erick, > > > > I was going through the CHANGES file from the 6_6 branch and just curious > > why are we not planning on putting SOLR-11177 in 7.0 ? > > > > On Thu, Aug 17, 2017 at 7:45 AM, Erick Erickson <erickerick...@gmail.com > > > > wrote: > >> > >> OK, I'm done with my changes for 7.0, I think Varun might have a few > too. > >> > >> And things didn't melt down overnight so... > >> > >> On Wed, Aug 16, 2017 at 12:25 PM, Anshum Gupta <ans...@anshumgupta.net> > >> wrote: > >> > +1 on getting the fixes into 7.0 if you are confident with those, and > if > >> > they are a part of 6.6.1. > >> > > >> > Thanks for taking care of this Erick. > >> > > >> > On Wed, Aug 16, 2017 at 12:24 PM Erick Erickson > >> > <erickerick...@gmail.com> > >> > wrote: > >> >> > >> >> FYI: > >> >> > >> >> I'll be backporting the following to SOLR 7.0 today: > >> >> > >> >> SOLR-11024: ParallelStream should set the StreamContext when > >> >> constructing SolrStreams: > >> >> SOLR-11177: CoreContainer.load needs to send lazily loaded core > >> >> descriptors to the proper list rather than send them all to the > >> >> transient lists. > >> >> SOLR-11122: Creating a core should write a core.properties file first > >> >> and clean up on failure > >> >> > >> >> and those as well as several others to 6.6.1. > >> >> > >> >> Since some of these depend on others, I need to add them in a > specific > >> >> order. I intend to run minimal tests for each JIRA before pushing, > >> >> then when they are all in place go through the full test cycle, > >> >> precommit and all that. I doubt that other than the flurry of commit > >> >> messages anyone will notice, at least if this stuff is as safe to > >> >> backport as I believe people _better_ not. > >> >> > >> >> If these cause any serious problems for the 7.0 code line, feel free > >> >> to back them out any time after today. > >> >> > >> >> Why am I bothering the 7.0 code line? well, it's awkward to have a > fix > >> >> in 6.6.1, skip 7.0 and have it show up again in 7.1. We can live with > >> >> some thing not being in 7.0 if any of this causes disruptions though. > >> >> > >> >> Erick > >> >> > >> >> On Wed, Aug 16, 2017 at 11:39 AM, Erik Hatcher < > erik.hatc...@gmail.com> > >> >> wrote: > >> >> > Yes, I’m confident in that patch and its safety, thanks Varun! > >> >> > > >> >> > Erik > >> >> > > >> >> > On Aug 16, 2017, at 2:22 PM, Varun Thacker <va...@vthacker.in> > wrote: > >> >> > > >> >> > @Erik -If you are confident with the patch and if you think it's > safe > >> >> > then > >> >> > please go ahead and commit it. I'll try having a look at it > tomorrow > >> >> > as > >> >> > well. > >> >> > > >> >> > I will start back-porting issues which I am comfortable with. If > >> >> > others > >> >> > can > >> >> > chime in as well it will be great. > >> >> > > >> >> > I'll aim to cut an RC on Monday 21st August evening PST time so > >> >> > everyone > >> >> > get's time to get the fixes in. > >> >> > > >> >> > Any objections in the approach? > >> >> > > >> >> > On Tue, Aug 15, 2017 at 4:56 AM, Erik Hatcher > >> >> > <erik.hatc...@gmail.com> > >> >> > wrote: > >> >> >> > >> >> >> I’d like to get https://issues.apache.org/jira/browse/SOLR-10874 > in > >> >> >> soon > >> >> >> as well. Varun, if you’d like to take this one over that’d be > fine > >> >> >> by > >> >> >> me > >> >> >> too ;) otherwise prod me back channel and I’ll get to it. > Ideally I > >> >> >> should > >> >> >> have applied this one ages ago for 7.0, so maybe it can make it in > >> >> >> time > >> >> >> for > >> >> >> 6.6.1 and 7.0. > >> >> >> > >> >> >> Erik > >> >> >> > >> >> >> On Aug 14, 2017, at 5:51 PM, Varun Thacker <va...@vthacker.in> > >> >> >> wrote: > >> >> >> > >> >> >> From the change log of 6.7 / 7.0 and 7.1 the total count of bug > >> >> >> fixes > >> >> >> under lucene and solr are > >> >> >> > >> >> >> Lucene : 7 > >> >> >> Solr : 61 > >> >> >> > >> >> >> > >> >> >> I'd be happy to volunteer as a release manager for a bug fix 6.6.1 > >> >> >> release > >> >> >> if others in the community think it's a good idea > >> >> >> > >> >> >> > >> >> > > >> >> > > >> >> > >> >> ------------------------------------------------------------ > --------- > >> >> To unsubscribe, e-mail: dev-unsubscr...@lucene.apache.org > >> >> For additional commands, e-mail: dev-h...@lucene.apache.org > >> >> > >> > > >> > >> --------------------------------------------------------------------- > >> To unsubscribe, e-mail: dev-unsubscr...@lucene.apache.org > >> For additional commands, e-mail: dev-h...@lucene.apache.org > >> > > > > --------------------------------------------------------------------- > To unsubscribe, e-mail: dev-unsubscr...@lucene.apache.org > For additional commands, e-mail: dev-h...@lucene.apache.org > >