You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by is...@apache.org on 2020/12/05 04:37:41 UTC
[lucene-solr] 14/18: merge with master
This is an automated email from the ASF dual-hosted git repository.
ishan pushed a commit to branch jira/solr14827
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
commit 12d492ac83a9205cd236ad99801b90286438cff9
Author: Noble Paul <no...@gmail.com>
AuthorDate: Mon Oct 12 12:12:49 2020 +1100
merge with master
---
.../src/java/org/apache/solr/prometheus/exporter/MetricsQuery.java | 2 +-
.../org/apache/solr/prometheus/exporter/PrometheusExporterSettings.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/solr/contrib/prometheus-exporter/src/java/org/apache/solr/prometheus/exporter/MetricsQuery.java b/solr/contrib/prometheus-exporter/src/java/org/apache/solr/prometheus/exporter/MetricsQuery.java
index 9a8783f..eefc14b 100644
--- a/solr/contrib/prometheus-exporter/src/java/org/apache/solr/prometheus/exporter/MetricsQuery.java
+++ b/solr/contrib/prometheus-exporter/src/java/org/apache/solr/prometheus/exporter/MetricsQuery.java
@@ -27,8 +27,8 @@ import net.thisptr.jackson.jq.JsonQuery;
import net.thisptr.jackson.jq.exception.JsonQueryException;
import org.apache.solr.client.solrj.request.QueryRequest;
import org.apache.solr.common.params.ModifiableSolrParams;
-import org.apache.solr.common.util.DOMUtil;
import org.apache.solr.common.util.NamedList;
+import org.apache.solr.common.util.DOMUtil;
import org.w3c.dom.Node;
public class MetricsQuery {
diff --git a/solr/contrib/prometheus-exporter/src/java/org/apache/solr/prometheus/exporter/PrometheusExporterSettings.java b/solr/contrib/prometheus-exporter/src/java/org/apache/solr/prometheus/exporter/PrometheusExporterSettings.java
index 9ce035d..68eda8d 100644
--- a/solr/contrib/prometheus-exporter/src/java/org/apache/solr/prometheus/exporter/PrometheusExporterSettings.java
+++ b/solr/contrib/prometheus-exporter/src/java/org/apache/solr/prometheus/exporter/PrometheusExporterSettings.java
@@ -19,8 +19,8 @@ package org.apache.solr.prometheus.exporter;
import java.util.List;
-import org.apache.solr.common.util.DOMUtil;
import org.apache.solr.common.util.NamedList;
+import org.apache.solr.common.util.DOMUtil;
import org.w3c.dom.Node;
public class PrometheusExporterSettings {