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/06 11:16:17 UTC
[lucene-solr] 01/02: 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 f371df327fb746734cbcca0fae1dd36559b2ee86
Merge: cd7fd6d 7417fa1
Author: Dawid Weiss <dw...@apache.org>
AuthorDate: Fri Dec 6 11:57:29 2019 +0100
Merge remote-tracking branch 'origin/master' into gradle-master
lucene/ivy-versions.properties | 6 +-
.../apache/lucene/util/TestSecurityManager.java | 87 ---------
solr/CHANGES.txt | 4 +
solr/common-build.xml | 5 +
.../solr/cloud/autoscaling/sim/SimScenario.java | 2 +-
.../solr/handler/tagger/XmlOffsetCorrector.java | 26 +--
.../cloud/autoscaling/sim/TestSimScenario.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/server/solr/zoo.cfg | 3 +
.../solrcloud-autoscaling-policy-preferences.adoc | 2 +-
solr/solrj/ivy.xml | 4 +-
.../src/test-files/solrj/solr/multicore/zoo.cfg | 2 +
.../org/apache/solr/util/SolrSecurityManager.java | 13 +-
21 files changed, 279 insertions(+), 121 deletions(-)