You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by us...@apache.org on 2016/02/16 17:15:59 UTC

lucene-solr git commit: LUCENE-6989: Merge changes

Repository: lucene-solr
Updated Branches:
  refs/heads/master 7ff31daeb -> 44b58ee4f


LUCENE-6989: Merge changes


Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/44b58ee4
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/44b58ee4
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/44b58ee4

Branch: refs/heads/master
Commit: 44b58ee4f8829581565bd22cfae01c5e1f864b36
Parents: 7ff31da
Author: Uwe Schindler <us...@apache.org>
Authored: Tue Feb 16 17:11:00 2016 +0100
Committer: Uwe Schindler <us...@apache.org>
Committed: Tue Feb 16 17:15:27 2016 +0100

----------------------------------------------------------------------
 lucene/CHANGES.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/44b58ee4/lucene/CHANGES.txt
----------------------------------------------------------------------
diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt
index e5e6715..24632de 100644
--- a/lucene/CHANGES.txt
+++ b/lucene/CHANGES.txt
@@ -260,7 +260,8 @@ Bug Fixes
 * LUCENE-7019: Add two-phase iteration to GeoPointTermQueryConstantScoreWrapper.
   (Robert Muir via Nick Knize)
 
-* LUCENE-6989: Disable MMapDirectory unmap-hack for Java 9. Official support
+* LUCENE-6989: Improve MMapDirectory's unmapping checks to catch more non-working
+  cases. The unmap-hack does not yet work with recent Java 9. Official support
   will come with Lucene 6.  (Uwe Schindler)
 
 Other