You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ab...@apache.org on 2017/10/19 08:30:57 UTC

[09/50] [abbrv] lucene-solr:jira/solr-11072: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/lucene-solr

Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/lucene-solr


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

Branch: refs/heads/jira/solr-11072
Commit: 87f9bcdbb97f1b6af1acf842563adc7cce9c6ab4
Parents: 0953cb3 dc640f0
Author: Noble Paul <no...@apache.org>
Authored: Tue Oct 17 23:35:24 2017 +1030
Committer: Noble Paul <no...@apache.org>
Committed: Tue Oct 17 23:35:24 2017 +1030

----------------------------------------------------------------------
 dev-tools/doap/lucene.rdf                          |   7 +++++++
 dev-tools/doap/solr.rdf                            |   7 +++++++
 dev-tools/scripts/write.stage.maven.build.xml.pl   |   1 -
 .../lucene/index/TestBackwardsCompatibility.java   |   7 +++++--
 .../org/apache/lucene/index/index.7.1.0-cfs.zip    | Bin 0 -> 15612 bytes
 .../org/apache/lucene/index/index.7.1.0-nocfs.zip  | Bin 0 -> 15609 bytes
 .../test/org/apache/lucene/index/sorted.7.1.0.zip  | Bin 0 -> 81963 bytes
 lucene/common-build.xml                            |  10 ++++++++--
 solr/CHANGES.txt                                   |   9 +++++++--
 .../java/org/apache/solr/cloud/ZkController.java   |  14 ++++++++++++++
 .../java/org/apache/solr/core/CoreContainer.java   |   5 +++++
 11 files changed, 53 insertions(+), 7 deletions(-)
----------------------------------------------------------------------