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 2020/03/02 16:46:20 UTC
[lucene-solr] 01/01: Merge branch 'master' into jira/solr-14275
This is an automated email from the ASF dual-hosted git repository.
ab pushed a commit to branch jira/solr-14275
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
commit ce22c52f4c7602c4bec5c10130054affa6d55020
Merge: 97450ee c6bf8b6
Author: Andrzej Bialecki <ab...@apache.org>
AuthorDate: Thu Feb 27 17:40:23 2020 +0100
Merge branch 'master' into jira/solr-14275
.../java/org/apache/lucene/util/QueryBuilder.java | 131 ++-------------------
.../org/apache/lucene/util/TestQueryBuilder.java | 18 +--
lucene/ivy-versions.properties | 4 +-
.../queryparser/classic/TestQueryParser.java | 24 ++--
.../lucene/spatial/spatial4j/Geo3dBinaryCodec.java | 5 +-
.../Geo3dShapeSphereModelRectRelationTest.java | 2 +-
solr/CHANGES.txt | 9 ++
.../solr/collection1/conf/solrconfig.xml | 6 -
.../collection1/conf/dataimport-solrconfig.xml | 6 -
.../collection1/conf/contentstream-solrconfig.xml | 6 -
.../conf/dataimport-nodatasource-solrconfig.xml | 6 -
.../collection1/conf/dataimport-solrconfig.xml | 6 -
.../solr/collection1/conf/solrconfig.xml | 3 -
.../contrib/jaegertracer-configurator/build.gradle | 1 +
.../apache/solr/jaeger/TestJaegerConfigurator.java | 14 ++-
.../src/java/org/apache/solr/core/SolrConfig.java | 8 +-
.../java/org/apache/solr/handler/GraphHandler.java | 37 ++++--
.../org/apache/solr/metrics/AggregateMetric.java | 6 +
.../processor/AtomicUpdateDocumentMerger.java | 9 +-
.../src/java/org/apache/solr/util/ExportTool.java | 31 +++++
.../conf/solrconfig-analytics-query.xml | 3 -
.../conf/solrconfig-cache-enable-disable.xml | 3 -
.../conf/solrconfig-collapseqparser.xml | 3 -
.../solr/collection1/conf/solrconfig-elevate.xml | 3 -
.../solr/collection1/conf/solrconfig-minhash.xml | 3 -
.../collection1/conf/solrconfig-plugcollector.xml | 3 -
.../solr/collection1/conf/solrconfig.xml | 3 -
.../src/test-files/solr/crazy-path-to-config.xml | 1 -
.../src/test/org/apache/solr/core/SOLR749Test.java | 22 +++-
.../solr/search/TestExtendedDismaxParser.java | 6 +-
.../apache/solr/search/TestMultiWordSynonyms.java | 18 +--
.../apache/solr/search/TestSolrQueryParser.java | 42 +++----
.../update/TestInPlaceUpdateWithRouteField.java | 20 ++--
.../test/org/apache/solr/update/TestUpdate.java | 2 +-
.../test/org/apache/solr/util/TestExportTool.java | 24 ++--
.../apache/solr/util/stats/MetricUtilsTest.java | 70 ++++++++---
solr/licenses/jaeger-core-0.35.5.jar.sha1 | 1 -
solr/licenses/jaeger-core-1.1.0.jar.sha1 | 1 +
solr/licenses/jaeger-thrift-0.35.5.jar.sha1 | 1 -
solr/licenses/jaeger-thrift-1.1.0.jar.sha1 | 1 +
solr/licenses/libthrift-0.12.0.jar.sha1 | 1 -
solr/licenses/libthrift-0.13.0.jar.sha1 | 1 +
solr/solr-ref-guide/src/metrics-reporting.adoc | 2 +-
solr/solr-ref-guide/src/streaming-expressions.adoc | 4 +-
versions.lock | 12 +-
versions.props | 2 +-
46 files changed, 268 insertions(+), 316 deletions(-)