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/09/28 22:09:31 UTC
[15/24] lucene-solr:jira/solr-11285: Merge branch 'master' into
feature/autoscaling
Merge branch 'master' into feature/autoscaling
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/1b3cd346
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/1b3cd346
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/1b3cd346
Branch: refs/heads/jira/solr-11285
Commit: 1b3cd346603070f9ee59e9ada98d74a084467481
Parents: ab994e7 4e55977
Author: Shalin Shekhar Mangar <sh...@apache.org>
Authored: Tue Sep 19 11:57:46 2017 -0700
Committer: Shalin Shekhar Mangar <sh...@apache.org>
Committed: Tue Sep 19 11:57:46 2017 -0700
----------------------------------------------------------------------
lucene/CHANGES.txt | 3 +
.../lucene/analysis/synonym/SynonymMap.java | 3 +-
.../apache/lucene/search/ConjunctionScorer.java | 4 +-
.../apache/lucene/search/TestConjunctions.java | 56 +++++++-
solr/CHANGES.txt | 8 ++
.../solr/handler/CdcrReplicatorManager.java | 8 +-
.../org/apache/solr/response/DocsStreamer.java | 87 +++----------
.../solr/response/RetrieveFieldsOptimizer.java | 130 +++++++++++++++++++
.../apache/solr/search/SolrDocumentFetcher.java | 25 +++-
.../facet/FacetFieldProcessorByHashDV.java | 11 +-
.../org/apache/solr/search/facet/HLLAgg.java | 1 +
.../org/apache/solr/search/facet/UniqueAgg.java | 1 +
.../solr/search/join/GraphPointsCollector.java | 1 +
.../apache/solr/cloud/CdcrBootstrapTest.java | 1 -
.../cloud/TestCloudJSONFacetJoinDomain.java | 24 ++--
.../response/TestRetrieveFieldsOptimizer.java | 56 ++++++++
.../solr/search/facet/TestJsonFacets.java | 26 ++++
.../conf/solrconfig.xml | 1 -
18 files changed, 357 insertions(+), 89 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/1b3cd346/solr/CHANGES.txt
----------------------------------------------------------------------