You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by mi...@apache.org on 2016/06/05 09:51:13 UTC

[12/19] lucene-solr:master: Merge branch 'master' into sequence_numbers

Merge branch 'master' into sequence_numbers


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

Branch: refs/heads/master
Commit: 72115c89d5610c117209e1d5210c056aee578020
Parents: 76fb616 09372ac
Author: Mike McCandless <mi...@apache.org>
Authored: Wed Jun 1 18:28:31 2016 -0400
Committer: Mike McCandless <mi...@apache.org>
Committed: Wed Jun 1 18:28:31 2016 -0400

----------------------------------------------------------------------
 dev-tools/scripts/checkJavaDocs.py              |  74 +++----
 lucene/CHANGES.txt                              |   9 +-
 .../index/TestBackwardsCompatibility.java       |   4 +-
 .../org/apache/lucene/index/index.6.0.1-cfs.zip | Bin 0 -> 13734 bytes
 .../apache/lucene/index/index.6.0.1-nocfs.zip   | Bin 0 -> 13735 bytes
 .../java/org/apache/lucene/geo/Polygon2D.java   |  18 +-
 .../lucene/index/BufferedUpdatesStream.java     |  30 ++-
 .../apache/lucene/index/CoalescedUpdates.java   |  14 +-
 .../apache/lucene/index/DocValuesUpdate.java    |   2 +-
 .../java/org/apache/lucene/util/ArrayUtil.java  |  71 ++++++
 .../apache/lucene/util/BytesRefComparator.java  |  55 +++++
 .../lucene/util/FixedLengthBytesRefArray.java   |  29 +++
 .../org/apache/lucene/util/MSBRadixSorter.java  | 219 +++++++++++++++++++
 .../lucene/util/StringMSBRadixSorter.java       | 158 ++-----------
 .../org/apache/lucene/util/bkd/BKDWriter.java   | 113 ++++------
 .../index/TestNumericDocValuesUpdates.java      | 112 +++++++++-
 .../lucene/search/spans/TestSpanCollection.java |  11 +-
 .../org/apache/lucene/util/TestArrayUtil.java   |  36 ++-
 .../apache/lucene/util/TestMSBRadixSorter.java  | 117 ++++++++++
 .../store/TestHardLinkCopyDirectoryWrapper.java |   3 +
 .../lucene/document/TestHalfFloatPoint.java     |   2 +-
 .../prefix/tree/DateRangePrefixTreeTest.java    |   7 +-
 .../apache/lucene/spatial3d/geom/XYZBounds.java |   2 +-
 solr/CHANGES.txt                                |  17 ++
 .../apache/solr/handler/RequestHandlerBase.java |  29 ++-
 .../apache/solr/handler/loader/JsonLoader.java  |  37 +++-
 .../solr/highlight/DefaultSolrHighlighter.java  | 103 ++++++---
 .../TopGroupsResultTransformer.java             |   2 +-
 .../solr/spelling/SpellCheckCollator.java       |   3 +
 .../apache/solr/TestDistributedGrouping.java    |  34 ++-
 .../cloud/DistribJoinFromCollectionTest.java    | 144 ++++++------
 .../apache/solr/cloud/TestSSLRandomization.java | 202 +++++++++++++++++
 .../org/apache/solr/handler/JsonLoaderTest.java |  21 ++
 .../apache/solr/highlight/HighlighterTest.java  |  82 ++++++-
 .../TestSubQueryTransformerDistrib.java         |  69 ++++--
 .../search/join/BlockJoinFacetDistribTest.java  |  97 +++++---
 .../solr/spelling/SpellCheckCollatorTest.java   |  30 +++
 .../solr/common/params/HighlightParams.java     |   1 +
 .../solr/common/util/JsonRecordReader.java      | 138 ++++++++----
 .../solr/common/util/TestJsonRecordReader.java  |  62 ++++--
 .../java/org/apache/solr/SolrTestCaseJ4.java    |  27 +--
 .../java/org/apache/solr/util/RandomizeSSL.java | 174 +++++++++++++++
 42 files changed, 1839 insertions(+), 519 deletions(-)
----------------------------------------------------------------------