You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by cp...@apache.org on 2017/09/08 10:00:53 UTC
[10/10] lucene-solr:jira/solr-10990: Merge remote-tracking branch
'origin/master' into jira/solr-10990
Merge remote-tracking branch 'origin/master' into jira/solr-10990
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/f95312da
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/f95312da
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/f95312da
Branch: refs/heads/jira/solr-10990
Commit: f95312da8788247a34d12977f96f8df5ff3c1dc7
Parents: e98eda9 5fee937
Author: Christine Poerschke <cp...@apache.org>
Authored: Fri Sep 8 11:00:13 2017 +0100
Committer: Christine Poerschke <cp...@apache.org>
Committed: Fri Sep 8 11:00:13 2017 +0100
----------------------------------------------------------------------
build.xml | 18 +-
lucene/analysis/build.xml | 4 +
.../index/TestBackwardsCompatibility.java | 4 +-
.../lucene/index/unsupported.6.6.1-cfs.zip | Bin 0 -> 15836 bytes
.../lucene/index/unsupported.6.6.1-nocfs.zip | Bin 0 -> 15830 bytes
lucene/build.xml | 13 ++
lucene/codecs/build.xml | 2 +
lucene/common-build.xml | 53 ++++-
lucene/core/build.xml | 2 +
.../apache/lucene/spatial3d/geom/GeoPath.java | 30 +++
.../lucene/spatial3d/geom/GeoStandardPath.java | 89 +++++++++
.../lucene/spatial3d/geom/GeoPathTest.java | 2 +
solr/CHANGES.txt | 4 +-
solr/bin/solr | 6 -
solr/bin/solr.cmd | 15 +-
solr/bin/solr.in.cmd | 11 --
solr/bin/solr.in.sh | 11 --
solr/build.xml | 16 +-
solr/core/build.xml | 2 +
.../solr/handler/admin/MetricsHandler.java | 11 +-
.../org/apache/solr/parser/FastCharStream.java | 7 +-
.../util/configuration/SSLConfigurations.java | 102 +++-------
.../configuration/SSLConfigurationsFactory.java | 2 +-
.../configuration/SSLCredentialProvider.java | 36 ----
.../SSLCredentialProviderFactory.java | 93 ---------
.../AbstractSSLCredentialProvider.java | 56 ------
.../providers/EnvSSLCredentialProvider.java | 68 -------
.../providers/HadoopSSLCredentialProvider.java | 66 -------
.../providers/SysPropSSLCredentialProvider.java | 38 ----
.../solr/handler/admin/MetricsHandlerTest.java | 9 +
.../configuration/SSLConfigurationsTest.java | 193 +++----------------
.../SSLCredentialProviderFactoryTest.java | 90 ---------
.../providers/EnvSSLCredentialProviderTest.java | 52 -----
.../HadoopSSLCredentialProviderTest.java | 72 -------
.../SysPropSSLCredentialProviderTest.java | 55 ------
solr/licenses/commons-math3-3.6.1.jar.sha1 | 2 +-
solr/server/etc/jetty-ssl.xml | 8 +-
solr/solrj/build.xml | 2 +
solr/webapp/build.xml | 3 +
39 files changed, 318 insertions(+), 929 deletions(-)
----------------------------------------------------------------------