You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ro...@apache.org on 2016/10/28 13:07:44 UTC
lucene-solr:branch_6x: SOLR-9132: Fix precommit
Repository: lucene-solr
Updated Branches:
refs/heads/branch_6x 14cfb82bf -> bb33bb7d4
SOLR-9132: Fix precommit
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/bb33bb7d
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/bb33bb7d
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/bb33bb7d
Branch: refs/heads/branch_6x
Commit: bb33bb7d4c6f5547022abb2b61a844e8daaaf8fb
Parents: 14cfb82
Author: Alan Woodward <ro...@apache.org>
Authored: Fri Oct 28 13:29:13 2016 +0100
Committer: Alan Woodward <ro...@apache.org>
Committed: Fri Oct 28 13:47:00 2016 +0100
----------------------------------------------------------------------
.../test/org/apache/solr/cloud/CreateCollectionCleanupTest.java | 1 -
solr/core/src/test/org/apache/solr/cloud/RecoveryZkTest.java | 4 ++--
2 files changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/bb33bb7d/solr/core/src/test/org/apache/solr/cloud/CreateCollectionCleanupTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/CreateCollectionCleanupTest.java b/solr/core/src/test/org/apache/solr/cloud/CreateCollectionCleanupTest.java
index df7a2e2..869f66c 100644
--- a/solr/core/src/test/org/apache/solr/cloud/CreateCollectionCleanupTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/CreateCollectionCleanupTest.java
@@ -17,7 +17,6 @@
package org.apache.solr.cloud;
-import java.util.ArrayList;
import java.util.Properties;
import org.apache.solr.client.solrj.impl.CloudSolrClient;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/bb33bb7d/solr/core/src/test/org/apache/solr/cloud/RecoveryZkTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/RecoveryZkTest.java b/solr/core/src/test/org/apache/solr/cloud/RecoveryZkTest.java
index 0aecdf9..7e30d5c 100644
--- a/solr/core/src/test/org/apache/solr/cloud/RecoveryZkTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/RecoveryZkTest.java
@@ -38,7 +38,7 @@ import org.slf4j.LoggerFactory;
@Slow
public class RecoveryZkTest extends SolrCloudTestCase {
- private static Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
@BeforeClass
public static void setupCluster() throws Exception {
@@ -140,7 +140,7 @@ public class RecoveryZkTest extends SolrCloudTestCase {
}
for (int j = 1; j < replicas.size(); j++) {
if (numCounts[j] != numCounts[j - 1])
- fail("Mismatch in counts between replicas"); // nocommit improve this!
+ fail("Mismatch in counts between replicas"); // TODO improve this!
if (numCounts[j] == 0 && expectDocs)
fail("Expected docs on shard " + shard.getName() + " but found none");
}