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/07 10:31:47 UTC
[7/7] 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/53c6e680
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/53c6e680
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/53c6e680
Branch: refs/heads/jira/solr-10990
Commit: 53c6e68042b97dc53fcabcaa4d405161cc9add8f
Parents: aa7f6b8 2a8d9b0
Author: Christine Poerschke <cp...@apache.org>
Authored: Thu Sep 7 11:31:08 2017 +0100
Committer: Christine Poerschke <cp...@apache.org>
Committed: Thu Sep 7 11:31:08 2017 +0100
----------------------------------------------------------------------
dev-tools/doap/lucene.rdf | 9 +-
dev-tools/doap/solr.rdf | 7 +
lucene/ivy-versions.properties | 2 +-
solr/CHANGES.txt | 2 +
solr/bin/solr | 6 +
solr/bin/solr.cmd | 15 +-
solr/bin/solr.in.cmd | 11 ++
solr/bin/solr.in.sh | 11 ++
.../org/apache/solr/handler/StreamHandler.java | 13 +-
.../apache/solr/search/LuceneQParserPlugin.java | 54 ------
.../solr/search/OldLuceneQParserPlugin.java | 37 ----
.../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/collection1/conf/solrconfig.xml | 3 -
.../org/apache/solr/ConvertedLegacyTest.java | 70 ++++---
.../apache/solr/handler/SearchHandlerTest.java | 4 +-
.../apache/solr/search/QueryEqualityTest.java | 8 -
.../apache/solr/search/QueryParsingTest.java | 1 -
.../configuration/SSLConfigurationsTest.java | 193 ++++++++++++++++---
.../SSLCredentialProviderFactoryTest.java | 90 +++++++++
.../providers/EnvSSLCredentialProviderTest.java | 52 +++++
.../HadoopSSLCredentialProviderTest.java | 72 +++++++
.../SysPropSSLCredentialProviderTest.java | 55 ++++++
solr/licenses/commons-math3-3.4.1.jar.sha1 | 1 -
solr/licenses/commons-math3-3.6.1.jar.sha1 | 1 +
solr/server/etc/jetty-ssl.xml | 8 +-
.../src/solrcloud-autoscaling-overview.adoc | 2 +-
.../io/eval/BinomialDistributionEvaluator.java | 48 +++++
.../io/eval/CumulativeProbabilityEvaluator.java | 21 +-
.../eval/EnumeratedDistributionEvaluator.java | 45 +++++
.../solrj/io/eval/FrequencyTableEvaluator.java | 84 ++++++++
.../solrj/io/eval/HistogramEvaluator.java | 7 +-
.../io/eval/PoissonDistributionEvaluator.java | 44 +++++
.../solrj/io/eval/ProbabilityEvaluator.java | 52 +++++
.../client/solrj/io/eval/SampleEvaluator.java | 18 +-
.../UniformIntegerDistributionEvaluator.java | 48 +++++
.../solrj/io/stream/StreamExpressionTest.java | 144 ++++++++++++++
43 files changed, 1479 insertions(+), 220 deletions(-)
----------------------------------------------------------------------