You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ab...@apache.org on 2018/03/06 17:28:45 UTC
[8/8] lucene-solr:jira/solr-11670-2: Merge branch 'master' into
jira/solr-11670-2
Merge branch 'master' into jira/solr-11670-2
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/9f5103a3
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/9f5103a3
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/9f5103a3
Branch: refs/heads/jira/solr-11670-2
Commit: 9f5103a3cbd33659bcdcb1247ae841487cd4440e
Parents: f9ad3fb 9cec222
Author: Andrzej Bialecki <ab...@apache.org>
Authored: Tue Mar 6 18:28:26 2018 +0100
Committer: Andrzej Bialecki <ab...@apache.org>
Committed: Tue Mar 6 18:28:26 2018 +0100
----------------------------------------------------------------------
.../prefix/tree/SpatialPrefixTreeFactory.java | 3 +
solr/CHANGES.txt | 7 +
solr/contrib/prometheus-exporter/README.md | 21 --
solr/contrib/prometheus-exporter/README.txt | 22 +-
.../solr/prometheus/exporter/SolrExporter.java | 13 +-
.../org/apache/solr/cloud/ZkController.java | 2 +-
.../solr/cloud/api/collections/BackupCmd.java | 2 +
.../solr/cloud/api/collections/RestoreCmd.java | 3 +
.../cloud/autoscaling/ComputePlanAction.java | 2 +-
.../cloud/autoscaling/ScheduledTrigger.java | 25 +-
.../apache/solr/core/backup/BackupManager.java | 43 +++-
.../solr/handler/admin/CollectionsHandler.java | 11 +
.../solr/search/facet/FacetFieldProcessor.java | 7 +-
.../apache/solr/search/facet/FacetModule.java | 23 +-
.../apache/solr/cloud/CollectionPropsTest.java | 256 +++++++++++++++++++
.../solr/cloud/CollectionsAPISolrJTest.java | 36 +++
.../core/snapshots/TestSolrCloudSnapshots.java | 15 ++
.../solr/handler/admin/TestCollectionAPIs.java | 19 +-
.../solr/search/facet/TestJsonFacets.java | 11 +
solr/solr-ref-guide/src/collections-api.adoc | 43 ++++
...toring-solr-with-prometheus-and-grafana.adoc | 120 +++++----
.../src/solrcloud-autoscaling-triggers.adoc | 5 +-
.../solrj/request/CollectionAdminRequest.java | 39 +++
.../solrj/request/CollectionApiMapping.java | 7 +
.../solr/common/cloud/CollectionProperties.java | 117 +++++++++
.../common/cloud/CollectionPropsWatcher.java | 40 +++
.../apache/solr/common/cloud/ZkStateReader.java | 209 ++++++++++++++-
.../common/params/CollectionAdminParams.java | 10 +
.../solr/common/params/CollectionParams.java | 1 +
.../collections.collection.Commands.json | 20 +-
...ollectionAdminRequestRequiredParamsTest.java | 9 +-
.../solrj/request/TestV1toV2ApiMapper.java | 7 +
32 files changed, 1049 insertions(+), 99 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/9f5103a3/solr/core/src/java/org/apache/solr/cloud/autoscaling/ScheduledTrigger.java
----------------------------------------------------------------------
diff --cc solr/core/src/java/org/apache/solr/cloud/autoscaling/ScheduledTrigger.java
index 7c7e4e7,1aa7a0a..f673fad
--- a/solr/core/src/java/org/apache/solr/cloud/autoscaling/ScheduledTrigger.java
+++ b/solr/core/src/java/org/apache/solr/cloud/autoscaling/ScheduledTrigger.java
@@@ -34,8 -33,6 +34,7 @@@ import java.util.concurrent.TimeUnit
import org.apache.solr.client.solrj.cloud.autoscaling.SolrCloudManager;
import org.apache.solr.client.solrj.cloud.autoscaling.TriggerEventType;
import org.apache.solr.common.SolrException;
- import org.apache.solr.common.params.CollectionParams;
+import org.apache.solr.common.util.TimeSource;
import org.apache.solr.core.SolrResourceLoader;
import org.apache.solr.util.DateMathParser;
import org.apache.solr.util.TimeZoneUtils;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/9f5103a3/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/9f5103a3/solr/solrj/src/java/org/apache/solr/common/params/CollectionParams.java
----------------------------------------------------------------------