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

[12/12] lucene-solr:jira/solr-5944: Merge branch 'master' into jira/solr-5944

Merge branch 'master' into jira/solr-5944


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

Branch: refs/heads/jira/solr-5944
Commit: da3c44901bcfa89ac877d4b9bc95ff371cbaea96
Parents: 3a39dcb 9899cbd
Author: Ishan Chattopadhyaya <is...@apache.org>
Authored: Wed Jan 25 16:28:24 2017 +0530
Committer: Ishan Chattopadhyaya <is...@apache.org>
Committed: Wed Jan 25 16:28:24 2017 +0530

----------------------------------------------------------------------
 dev-tools/doap/lucene.rdf                       |   7 +-
 dev-tools/doap/solr.rdf                         |   9 +-
 lucene/CHANGES.txt                              |   9 ++
 .../index/TestBackwardsCompatibility.java       |   4 +-
 .../org/apache/lucene/index/index.6.4.0-cfs.zip | Bin 0 -> 15829 bytes
 .../apache/lucene/index/index.6.4.0-nocfs.zip   | Bin 0 -> 15831 bytes
 lucene/common-build.xml                         |  25 ++----
 .../SortedNumericDocValuesRangeQuery.java       |   5 +-
 .../lucene60/TestLucene60PointsFormat.java      |  37 ++++----
 .../org/apache/lucene/util/bkd/TestBKD.java     |  37 ++++----
 lucene/ivy-versions.properties                  |   2 +-
 .../randomizedtesting-runner-2.4.0.jar.sha1     |   1 -
 .../randomizedtesting-runner-2.5.0.jar.sha1     |   1 +
 lucene/tools/prettify/inject-javadocs.js        |  27 ++++++
 lucene/tools/prettify/lang-apollo.js            |  18 ----
 lucene/tools/prettify/lang-css.js               |  18 ----
 lucene/tools/prettify/lang-hs.js                |  18 ----
 lucene/tools/prettify/lang-lisp.js              |  19 ----
 lucene/tools/prettify/lang-lua.js               |  18 ----
 lucene/tools/prettify/lang-ml.js                |  18 ----
 lucene/tools/prettify/lang-proto.js             |  17 ----
 lucene/tools/prettify/lang-sql.js               |  18 ----
 lucene/tools/prettify/lang-vb.js                |  18 ----
 lucene/tools/prettify/lang-wiki.js              |  18 ----
 lucene/tools/prettify/prettify.css              |  30 +++----
 lucene/tools/prettify/prettify.js               |  90 ++++++++++---------
 solr/CHANGES.txt                                |   2 +
 .../component/MoreLikeThisComponent.java        |  12 ++-
 .../handler/component/TermVectorComponent.java  |   9 ++
 .../component/DistributedMLTComponentTest.java  |  23 +++++
 .../TermVectorComponentDistributedTest.java     |  18 ++++
 solr/licenses/junit4-ant-2.4.0.jar.sha1         |   1 -
 solr/licenses/junit4-ant-2.5.0.jar.sha1         |   1 +
 .../randomizedtesting-runner-2.4.0.jar.sha1     |   1 -
 .../randomizedtesting-runner-2.5.0.jar.sha1     |   1 +
 .../apache/solr/common/util/JavaBinCodec.java   |  10 +--
 36 files changed, 235 insertions(+), 307 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/da3c4490/solr/CHANGES.txt
----------------------------------------------------------------------