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 2016/07/06 21:26:16 UTC
[3/4] lucene-solr:branch_6x: Merge remote-tracking branch
'refs/remotes/origin/branch_6x' into branch_6x (SOLR-9180)
Merge remote-tracking branch 'refs/remotes/origin/branch_6x' into branch_6x (SOLR-9180)
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/f69e6246
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/f69e6246
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/f69e6246
Branch: refs/heads/branch_6x
Commit: f69e624645f62e1f2224f5ddb035379491a7a0ce
Parents: fee9526 a942de6
Author: Chris Hostetter <ho...@apache.org>
Authored: Wed Jul 6 14:15:21 2016 -0700
Committer: Chris Hostetter <ho...@apache.org>
Committed: Wed Jul 6 14:15:21 2016 -0700
----------------------------------------------------------------------
lucene/CHANGES.txt | 4 -
solr/CHANGES.txt | 4 +
.../java/org/apache/solr/core/SolrConfig.java | 10 +-
.../org/apache/solr/handler/GraphHandler.java | 2 +-
.../org/apache/solr/handler/StreamHandler.java | 1 +
.../handler/component/RealTimeGetComponent.java | 63 ++++-
.../solr/handler/component/SearchComponent.java | 2 +
.../solr/handler/component/SearchHandler.java | 2 +
.../solr/handler/component/TermsComponent.java | 122 ++++++++-
.../java/org/apache/solr/update/PeerSync.java | 124 ++++++++-
.../resources/EditableSolrConfigAttributes.json | 5 +-
solr/core/src/resources/ImplicitPlugins.json | 6 +
.../solr/collection1/conf/solrconfig-tlog.xml | 8 +-
.../test/org/apache/solr/MinimalSchemaTest.java | 4 +-
.../test/org/apache/solr/core/SolrCoreTest.java | 1 +
.../DistributedTermsComponentTest.java | 13 +-
.../handler/component/TermsComponentTest.java | 58 ++++-
.../solrj/io/stream/ScoreNodesStream.java | 256 +++++++++++++++++++
.../apache/solr/common/params/TermsParams.java | 12 +
.../solrj/io/graph/GraphExpressionTest.java | 131 ++++++++++
.../java/org/apache/solr/SolrTestCaseJ4.java | 2 +
21 files changed, 791 insertions(+), 39 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/f69e6246/solr/CHANGES.txt
----------------------------------------------------------------------