You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ja...@apache.org on 2018/10/03 14:18:50 UTC
[3/6] lucene-solr:solr12799-auth-forward: Merge branch 'master' into
solr12799-auth-interceptInternode
Merge branch 'master' into solr12799-auth-interceptInternode
# Conflicts:
# solr/CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/2e0e9ad2
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/2e0e9ad2
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/2e0e9ad2
Branch: refs/heads/solr12799-auth-forward
Commit: 2e0e9ad2da5bc9386ed9569b62724b284c227044
Parents: 133b773 86e0040
Author: Jan Høydahl <ja...@apache.org>
Authored: Mon Oct 1 15:21:11 2018 +0200
Committer: Jan Høydahl <ja...@apache.org>
Committed: Mon Oct 1 15:21:11 2018 +0200
----------------------------------------------------------------------
dev-tools/scripts/prep-solr-ref-guide-rc.sh | 4 +-
dev-tools/scripts/smokeTestRelease.py | 13 +-
lucene/CHANGES.txt | 5 +
lucene/common-build.xml | 1 -
.../org/apache/lucene/index/IndexWriter.java | 27 +-
.../org/apache/lucene/index/MergeState.java | 44 +-
.../apache/lucene/search/TermInSetQuery.java | 2 +-
.../apache/lucene/index/TestIndexSorting.java | 49 +-
.../document/BaseLatLonShapeTestCase.java | 2 +-
.../document/TestLatLonPolygonShapeQueries.java | 8 +-
solr/CHANGES.txt | 17 +
.../extraction/ExtractingRequestHandler.java | 33 +-
.../handler/extraction/ExtractionDateUtil.java | 178 -----
.../handler/extraction/SolrContentHandler.java | 41 +-
.../extraction/SolrContentHandlerFactory.java | 10 +-
.../ExtractingRequestHandlerTest.java | 6 +-
.../extraction/TestExtractionDateUtil.java | 62 --
.../org/apache/solr/cloud/RecoveryStrategy.java | 206 +++---
.../org/apache/solr/cloud/ZkShardTerms.java | 8 +-
.../cloud/api/collections/AddReplicaCmd.java | 45 +-
.../solr/cloud/api/collections/Assign.java | 362 ++++++----
.../api/collections/CreateCollectionCmd.java | 34 +-
.../cloud/api/collections/ReplaceNodeCmd.java | 33 +-
.../solr/cloud/api/collections/RestoreCmd.java | 16 +-
.../cloud/api/collections/SplitShardCmd.java | 17 +-
.../cloud/autoscaling/ComputePlanAction.java | 8 +-
.../cloud/autoscaling/IndexSizeTrigger.java | 12 +-
.../solr/cloud/overseer/ReplicaMutator.java | 4 +-
.../java/org/apache/solr/core/SolrConfig.java | 2 +-
.../solr/handler/admin/MetricsHandler.java | 4 +-
.../handler/admin/MetricsHistoryHandler.java | 4 +-
.../apache/solr/metrics/SolrMetricManager.java | 67 +-
.../metrics/reporters/SolrSlf4jReporter.java | 4 +-
.../reporters/solr/SolrClusterReporter.java | 8 +-
.../solr/search/ExtendedDismaxQParser.java | 89 ++-
.../configsets/_default/conf/managed-schema | 8 +-
.../configsets/_default/conf/solrconfig.xml | 1 -
.../org/apache/solr/cloud/AddReplicaTest.java | 10 +-
.../org/apache/solr/cloud/CloudTestUtils.java | 6 +-
.../solr/cloud/CollectionsAPISolrJTest.java | 13 +-
.../org/apache/solr/cloud/ZkShardTermsTest.java | 14 +-
.../CollectionTooManyReplicasTest.java | 8 +-
.../cloud/autoscaling/IndexSizeTriggerTest.java | 10 +-
.../solr/cloud/autoscaling/TestPolicyCloud.java | 1 +
.../cloud/autoscaling/sim/SimCloudManager.java | 66 +-
.../sim/SimClusterStateProvider.java | 706 ++++++++++++++-----
.../autoscaling/sim/SimDistribStateManager.java | 7 +
.../autoscaling/sim/SimNodeStateProvider.java | 21 +-
.../sim/TestSimExecutePlanAction.java | 4 +-
.../autoscaling/sim/TestSimExtremeIndexing.java | 163 +++++
.../autoscaling/sim/TestSimNodeLostTrigger.java | 2 +-
.../autoscaling/sim/TestSimPolicyCloud.java | 11 +-
.../sim/TestSimTriggerIntegration.java | 8 +-
.../solr/metrics/SolrMetricManagerTest.java | 14 -
.../solr/search/TestExtendedDismaxParser.java | 33 +-
.../configsets/_default/conf/managed-schema | 8 +-
.../configsets/_default/conf/solrconfig.xml | 1 -
solr/solr-ref-guide/src/meta-docs/publish.adoc | 7 +-
...g-data-with-solr-cell-using-apache-tika.adoc | 111 +--
.../cloud/autoscaling/FreeDiskVariable.java | 12 +-
.../client/solrj/cloud/autoscaling/Policy.java | 35 +-
.../solrj/cloud/autoscaling/PolicyHelper.java | 91 ++-
.../solrj/cloud/autoscaling/ReplicaInfo.java | 4 +-
.../client/solrj/cloud/autoscaling/Row.java | 2 +-
.../solrj/cloud/autoscaling/Suggester.java | 2 +-
.../solrj/cloud/autoscaling/Suggestion.java | 5 +
.../org/apache/solr/client/solrj/io/Lang.java | 5 +
.../solrj/io/eval/ConvexHullEvaluator.java | 62 ++
.../client/solrj/io/eval/GetAreaEvaluator.java | 43 ++
.../solrj/io/eval/GetBaryCenterEvaluator.java | 50 ++
.../solrj/io/eval/GetBoundarySizeEvaluator.java | 43 ++
.../solrj/io/eval/GetVerticesEvaluator.java | 51 ++
.../solr/common/ConditionalMapWriter.java | 2 +-
.../org/apache/solr/common/IteratorWriter.java | 9 +
.../java/org/apache/solr/common/MapWriter.java | 30 +
.../solr/common/cloud/ReplicaPosition.java | 2 +-
.../org/apache/solr/common/util/NamedList.java | 10 +-
.../java/org/apache/solr/common/util/Utils.java | 78 +-
.../collections.collection.Commands.json | 3 +-
.../testMoveReplicasInMultipleCollections.json | 88 +++
.../autoscaling/testSuggestionsRebalance2.json | 130 ++++
.../testSuggestionsRebalanceOnly.json | 105 +++
.../solrj/cloud/autoscaling/TestPolicy.java | 206 ++----
.../solrj/cloud/autoscaling/TestPolicy2.java | 45 +-
.../apache/solr/client/solrj/io/TestLang.java | 3 +-
.../solrj/io/stream/MathExpressionTest.java | 71 ++
86 files changed, 2549 insertions(+), 1296 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/2e0e9ad2/solr/CHANGES.txt
----------------------------------------------------------------------
diff --cc solr/CHANGES.txt
index 82eb96e,490bcf2..5ee68f7
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@@ -62,8 -65,8 +65,10 @@@ SOLR-12591: Expand the set of recognize
locale was changed from ROOT to en_US since well-known patterns assume this locale.
(David Smiley, Bar Rotstein)
+* SOLR-12799: Allow Authentication Plugins to intercept internode requests on a per-request basis (janhoy)
+
+ SOLR-12593: The default configSet now includes an "ignored_*" dynamic field. (David Smiley)
+
Other Changes
----------------------