You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@lucene.apache.org by no...@apache.org on 2019/08/01 00:35:26 UTC

[lucene-solr] 01/01: Merge branch 'master' into jira/SOLR-13650

This is an automated email from the ASF dual-hosted git repository.

noble pushed a commit to branch jira/SOLR-13650
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git

commit 4173b2a15a429391d8fcc1a86a7e4a3495fd9810
Merge: 24039e6 16ec64f
Author: noble <no...@apache.org>
AuthorDate: Thu Aug 1 10:34:17 2019 +1000

    Merge branch 'master' into jira/SOLR-13650
    
    sync with master

 dev-tools/doap/lucene.rdf                          |   7 +++++++
 dev-tools/doap/solr.rdf                            |   7 +++++++
 .../lucene/index/TestBackwardsCompatibility.java   |   7 +++++--
 .../org/apache/lucene/index/index.8.2.0-cfs.zip    | Bin 0 -> 15617 bytes
 .../org/apache/lucene/index/index.8.2.0-nocfs.zip  | Bin 0 -> 15630 bytes
 .../test/org/apache/lucene/index/sorted.8.2.0.zip  | Bin 0 -> 131154 bytes
 .../benchmark/byTask/feeds/DemoHTMLParser.java     |  21 +++++++--------------
 .../java/org/apache/lucene/index/FieldInfos.java   |   2 +-
 .../java/org/apache/lucene/store/FSDirectory.java  |   2 +-
 .../java/org/apache/lucene/store/RateLimiter.java  |  12 +++++++-----
 .../src/java/org/apache/lucene/util/Version.java   |   7 +++++++
 .../TestTopFieldCollectorEarlyTermination.java     |  12 +-----------
 .../apache/lucene/replicator/nrt/PrimaryNode.java  |   2 +-
 .../org/apache/lucene/util/LuceneTestCase.java     |   7 +++----
 .../solr/handler/TestContainerReqHandler.java      |   3 ++-
 15 files changed, 49 insertions(+), 40 deletions(-)