You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by mi...@apache.org on 2016/02/06 17:24:05 UTC
[11/15] lucene-solr git commit: Merge branch 'nrt_replicas' of
github.com:mikemccand/lucene-solr into nrt_replicas
Merge branch 'nrt_replicas' of github.com:mikemccand/lucene-solr into nrt_replicas
Conflicts:
lucene/replicator/src/test/org/apache/lucene/replicator/nrt/TestNRTReplication.java
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/82ecccf8
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/82ecccf8
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/82ecccf8
Branch: refs/heads/jira/lucene-5438-nrt-replication
Commit: 82ecccf8e9efbafd13c8a66362e8bebf5dca1c29
Parents: 7af83c4 d9f20f5
Author: Mike McCandless <mi...@apache.org>
Authored: Wed Feb 3 16:46:27 2016 -0500
Committer: Mike McCandless <mi...@apache.org>
Committed: Wed Feb 3 16:46:27 2016 -0500
----------------------------------------------------------------------
.../replicator/nrt/TestNRTReplication.java | 36 +++++++++++---------
1 file changed, 19 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82ecccf8/lucene/replicator/src/test/org/apache/lucene/replicator/nrt/TestNRTReplication.java
----------------------------------------------------------------------
diff --cc lucene/replicator/src/test/org/apache/lucene/replicator/nrt/TestNRTReplication.java
index 510a075,e2824af..7ba3bc2
--- a/lucene/replicator/src/test/org/apache/lucene/replicator/nrt/TestNRTReplication.java
+++ b/lucene/replicator/src/test/org/apache/lucene/replicator/nrt/TestNRTReplication.java
@@@ -28,17 -38,6 +38,8 @@@ import java.util.concurrent.atomic.Atom
import java.util.concurrent.atomic.AtomicLong;
import java.util.regex.Pattern;
- import org.apache.lucene.document.Document;
- import org.apache.lucene.util.IOUtils;
- import org.apache.lucene.util.LineFileDocs;
- import org.apache.lucene.util.LuceneTestCase;
- import org.apache.lucene.util.LuceneTestCase.SuppressCodecs;
- import org.apache.lucene.util.LuceneTestCase.SuppressSysoutChecks;
-
- import com.carrotsearch.randomizedtesting.SeedUtils;
-
+// nocommit make some explicit failure tests
+
// MockRandom's .sd file has no index header/footer:
@SuppressCodecs({"MockRandom", "Memory", "Direct", "SimpleText"})
@SuppressSysoutChecks(bugUrl = "Stuff gets printed, important stuff for debugging a failure")