> Mike can you make sure your readint/readvint mismatch and other important > bugfixes are not missing here?
Thanks Rob, I'll confirm this fix made it to 6.0. And, yes, I haven't merged LUCENE-7062 to 6.0 yet: it hit merge conflicts when I last tried, I thought (at the time) because Shalin's branch was missing a bunch of commits, but I'll try again. Mike McCandless http://blog.mikemccandless.com On Thu, Mar 3, 2016 at 10:58 AM, Robert Muir <[email protected]> wrote: > I took a look (by doing merge --squash from branch_6x to review > changes), and it mostly looks good, but i was surprised to see these > conflicts: > > both modified: > lucene/core/src/java/org/apache/lucene/index/CheckIndex.java > both modified: > lucene/core/src/test/org/apache/lucene/index/TestPointValues.java > both modified: > lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingPointFormat.java > > I think mike has not merged his checkindex work but I am surprised to > see merge conflicts? Mike can you make sure your readint/readvint > mismatch and other important bugfixes are not missing here? > > On Thu, Mar 3, 2016 at 10:25 AM, Shalin Shekhar Mangar > <[email protected]> wrote: >> I cherry-picked the following missing commits. I think I got all of >> the missing ones but another set of eyes would be good. >> >> Cherry-pick successful >> 3cbc48e LUCENE-7059: always visit 1D points in sorted >> order; fix tie-break but in BKDWriter; fix BKDWriter to pass on >> maxMBSortInHeap to the OfflineSorter too >> e1033d9 SOLR-8145: Fix position of OOM killer script when >> starting Solr in the background >> ddd019f SOLR-8145: mention fix in solr/CHANGES.txt >> 25cc48b LUCENE-7059: remove MultiPointValues >> 8eada27 LUCENE-7061: fix remaining api issues with XYZPoint >> classes >> b90dbd4 LUCENE-7060: Spatial4j 0.6 upgrade. Package >> com.spatial4j.core -> org.locationtech.spatial4j (cherry picked from >> commit 569b6ca) >> 6dcb01c SOLR-8764: test schema-latest.xml spatial dist >> units should be kilometers (no test uses yet?) (cherry picked from >> commit deb6a49) >> >> On Thu, Mar 3, 2016 at 7:22 PM, Shalin Shekhar Mangar >> <[email protected]> wrote: >>> Hmm I think I created the branch without pulling the latest code. I'll fix. >>> >>> On Thu, Mar 3, 2016 at 6:41 PM, Robert Muir <[email protected]> wrote: >>>> This is missing a bunch of yesterday's branch_6x changes. Some of >>>> david smiley's spatial work, at least one of my commits. >>>> >>>> On Thu, Mar 3, 2016 at 5:10 AM, Shalin Shekhar Mangar >>>> <[email protected]> wrote: >>>>> FYI, I have created the branch_6_0 so that we can continue to commit >>>>> stuff intended for 6.1 on master and branch_6x. I have also added the >>>>> 6.1.0 version on branch_6x and master. >>>>> >>>>> On Wed, Mar 2, 2016 at 9:51 PM, Shawn Heisey <[email protected]> wrote: >>>>>> On 3/2/2016 4:19 AM, Alan Woodward wrote: >>>>>>> Should we create a separate branch_6_0 branch for the feature-freeze? >>>>>>> I have stuff to push into master and that should eventually make it >>>>>>> into 6.1, and it will be easy to forget to backport stuff if there's a >>>>>>> week before I can do that… >>>>>> >>>>>> +1 >>>>>> >>>>>> When I saw Nick's email about branch_6x being feature frozen, my first >>>>>> thought was that we don't (and really can't) feature freeze the stable >>>>>> branch -- isn't new feature development (for the next minor release in >>>>>> the current major version) the entire purpose of branch_Nx? >>>>>> >>>>>> A feature freeze on a specific minor version does make sense. I've seen >>>>>> a couple of people say that we have, but there are also a few messages >>>>>> from people saying that they want to include new functionality in 6.0. >>>>>> I expect that backporting almost anything from branch_6x to branch_6_0 >>>>>> will be relatively easy, so it may be a good idea to just create the new >>>>>> branch. >>>>>> >>>>>> Thanks, >>>>>> Shawn >>>>>> >>>>>> >>>>>> --------------------------------------------------------------------- >>>>>> To unsubscribe, e-mail: [email protected] >>>>>> For additional commands, e-mail: [email protected] >>>>>> >>>>> >>>>> >>>>> >>>>> -- >>>>> Regards, >>>>> Shalin Shekhar Mangar. >>>>> >>>>> --------------------------------------------------------------------- >>>>> To unsubscribe, e-mail: [email protected] >>>>> For additional commands, e-mail: [email protected] >>>>> >>>> >>>> --------------------------------------------------------------------- >>>> To unsubscribe, e-mail: [email protected] >>>> For additional commands, e-mail: [email protected] >>>> >>> >>> >>> >>> -- >>> Regards, >>> Shalin Shekhar Mangar. >> >> >> >> -- >> Regards, >> Shalin Shekhar Mangar. >> >> --------------------------------------------------------------------- >> To unsubscribe, e-mail: [email protected] >> For additional commands, e-mail: [email protected] >> > > --------------------------------------------------------------------- > To unsubscribe, e-mail: [email protected] > For additional commands, e-mail: [email protected] > --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
