You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ho...@apache.org on 2017/06/14 18:09:15 UTC

[5/5] lucene-solr:jira/SOLR-10834: Merge branch 'master' into jira/SOLR-10834

Merge branch 'master' into jira/SOLR-10834


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

Branch: refs/heads/jira/SOLR-10834
Commit: b26bf9d60e2b94e0cdc365d1e2c0a37c33e24198
Parents: df11992 c3c8955
Author: Chris Hostetter <ho...@apache.org>
Authored: Wed Jun 14 11:06:37 2017 -0700
Committer: Chris Hostetter <ho...@apache.org>
Committed: Wed Jun 14 11:06:37 2017 -0700

----------------------------------------------------------------------
 lucene/CHANGES.txt                              |  4 ++
 .../index/TestBackwardsCompatibility.java       |  2 +-
 .../lucene/index/BufferedUpdatesStream.java     |  8 +--
 .../apache/lucene/search/TermInSetQuery.java    |  4 +-
 .../lucene50/TestBlockPostingsFormat.java       |  2 +-
 .../org/apache/lucene/index/Test2BDocs.java     |  2 +-
 .../test/org/apache/lucene/index/TestDoc.java   | 10 +--
 .../test/org/apache/lucene/index/TestFlex.java  | 13 ++--
 .../lucene/index/TestIndexReaderClose.java      |  8 +--
 .../apache/lucene/index/TestIndexWriter.java    |  4 +-
 .../lucene/index/TestIndexWriterUnicode.java    |  2 +-
 .../org/apache/lucene/index/TestPayloads.java   |  4 +-
 .../lucene/index/TestPerSegmentDeletes.java     |  4 +-
 .../lucene/index/TestPostingsOffsets.java       |  2 +-
 .../lucene/index/TestSegmentTermDocs.java       |  2 +-
 .../lucene/index/TestSegmentTermEnum.java       | 10 +--
 .../apache/lucene/index/TestStressAdvance.java  | 11 ++--
 .../org/apache/lucene/index/TestTermsEnum.java  | 23 +++++--
 .../lucene/search/TestMultiPhraseQuery.java     |  2 +-
 .../lucene/search/TestPhrasePrefixQuery.java    |  2 +-
 .../search/TestSameScoresWithThreads.java       |  2 +-
 .../lucene/index/memory/TestMemoryIndex.java    |  2 +-
 .../memory/TestMemoryIndexAgainstRAMDir.java    |  5 +-
 .../apache/lucene/queries/CommonTermsQuery.java |  4 +-
 .../function/valuesource/TFValueSource.java     |  6 +-
 .../valuesource/TermFreqValueSource.java        |  6 +-
 .../idversion/TestIDVersionPostingsFormat.java  |  4 +-
 .../ThreadedIndexingAndSearchingTestCase.java   | 12 +++-
 solr/CHANGES.txt                                |  4 ++
 .../handler/dataimport/VariableResolver.java    |  4 +-
 .../java/org/apache/solr/core/PluginBag.java    | 32 +++++++---
 .../solr/handler/admin/LukeRequestHandler.java  | 10 +--
 .../component/QueryElevationComponent.java      |  5 +-
 .../solr/handler/component/TermsComponent.java  | 38 ++++++-----
 .../solr/highlight/DefaultSolrHighlighter.java  |  2 +-
 .../org/apache/solr/request/SimpleFacets.java   |  4 +-
 .../java/org/apache/solr/search/DocSetUtil.java |  4 +-
 .../src/java/org/apache/solr/search/Filter.java |  2 +-
 .../solr/search/FloatPayloadValueSource.java    |  4 +-
 .../solr/search/GraphTermsQParserPlugin.java    | 16 ++---
 .../apache/solr/search/JoinQParserPlugin.java   | 12 ++--
 .../FacetFieldProcessorByEnumTermsStream.java   |  4 +-
 .../apache/solr/uninverting/DocTermOrds.java    |  4 +-
 .../apache/solr/update/SolrIndexSplitter.java   |  4 +-
 .../TemplateUpdateProcessorFactory.java         | 18 +++---
 .../processor/UpdateRequestProcessorChain.java  | 17 ++---
 .../configsets/cloud-minimal/conf/schema.xml    |  1 +
 .../processor/TemplateUpdateProcessorTest.java  | 67 ++++++++++++++++++--
 .../src/update-request-processors.adoc          |  2 +-
 .../cloud/AbstractFullDistribZkTestBase.java    |  2 +-
 50 files changed, 245 insertions(+), 171 deletions(-)
----------------------------------------------------------------------