You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ho...@apache.org on 2018/12/13 21:25:22 UTC
[2/2] lucene-solr:branch_7x: Fix bad merge that duplicated import
statements causing precommit failures
Fix bad merge that duplicated import statements causing precommit failures
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/f4a0f8e1
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/f4a0f8e1
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/f4a0f8e1
Branch: refs/heads/branch_7x
Commit: f4a0f8e19e22c77778c665fefb135b1cbf75f702
Parents: a6f1816
Author: Chris Hostetter <ho...@apache.org>
Authored: Thu Dec 13 14:25:11 2018 -0700
Committer: Chris Hostetter <ho...@apache.org>
Committed: Thu Dec 13 14:25:11 2018 -0700
----------------------------------------------------------------------
.../test/org/apache/solr/security/BasicAuthIntegrationTest.java | 3 ---
1 file changed, 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/f4a0f8e1/solr/core/src/test/org/apache/solr/security/BasicAuthIntegrationTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/security/BasicAuthIntegrationTest.java b/solr/core/src/test/org/apache/solr/security/BasicAuthIntegrationTest.java
index 34c9bd2..7534f0b 100644
--- a/solr/core/src/test/org/apache/solr/security/BasicAuthIntegrationTest.java
+++ b/solr/core/src/test/org/apache/solr/security/BasicAuthIntegrationTest.java
@@ -69,9 +69,6 @@ import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import static java.nio.charset.StandardCharsets.UTF_8;
-import static java.util.Collections.singletonMap;
-
public class BasicAuthIntegrationTest extends SolrCloudTestCase {
private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());