You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by dw...@apache.org on 2019/12/07 09:57:27 UTC
[lucene-solr] 03/03: Merge remote-tracking branch 'origin/master'
into gradle-master
This is an automated email from the ASF dual-hosted git repository.
dweiss pushed a commit to branch gradle-master
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
commit c3bb81f032a0628d83a63c45d592ed3380ad1cc1
Merge: 2a6ffd2 a1e51cd
Author: Dawid Weiss <da...@carrotsearch.com>
AuthorDate: Sat Dec 7 10:53:34 2019 +0100
Merge remote-tracking branch 'origin/master' into gradle-master
lucene/ivy-versions.properties | 6 +-
solr/CHANGES.txt | 5 +-
solr/bin/solr | 4 +-
.../solr/handler/tagger/XmlOffsetCorrector.java | 26 ++-
.../java/org/apache/solr/search/facet/AggUtil.java | 24 ++-
.../org/apache/solr/search/facet/DocValuesAcc.java | 34 ++--
.../java/org/apache/solr/search/facet/HLLAgg.java | 12 +-
.../org/apache/solr/search/facet/MinMaxAgg.java | 5 +-
.../apache/solr/search/facet/PercentileAgg.java | 9 +-
.../java/org/apache/solr/search/facet/SlotAcc.java | 4 +-
.../org/apache/solr/search/facet/StddevAgg.java | 8 +-
.../org/apache/solr/search/facet/UniqueAgg.java | 12 +-
.../org/apache/solr/search/facet/VarianceAgg.java | 8 +-
.../solr/cloud/CreateCollectionCleanupTest.java | 7 +-
solr/licenses/aalto-xml-1.2.2.jar.sha1 | 1 -
solr/licenses/aalto-xml-LICENSE-ASL.txt | 201 ---------------------
solr/licenses/aalto-xml-NOTICE.txt | 0
solr/licenses/stax2-api-3.1.4.jar.sha1 | 1 +
solr/licenses/stax2-api-4.2.jar.sha1 | 1 -
solr/licenses/staxmate-2.3.1.jar.sha1 | 1 -
solr/licenses/staxmate-LICENSE-BSD.txt | 33 ----
solr/licenses/staxmate-NOTICE.txt | 0
solr/licenses/woodstox-core-asl-4.4.1.jar.sha1 | 1 +
solr/solrj/ivy.xml | 4 +-
24 files changed, 103 insertions(+), 304 deletions(-)