You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by cj...@apache.org on 2013/10/16 03:49:07 UTC
git commit: ACCUMULO-1751 Bad merge line left in IT
Updated Branches:
refs/heads/master 872b6db37 -> a9da42921
ACCUMULO-1751 Bad merge line left in IT
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a9da4292
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a9da4292
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/a9da4292
Branch: refs/heads/master
Commit: a9da42921aab22b772d9d52055a02fe79aa3dac7
Parents: 872b6db
Author: Corey J. Nolet <cj...@gmail.com>
Authored: Tue Oct 15 21:49:06 2013 -0400
Committer: Corey J. Nolet <cj...@gmail.com>
Committed: Tue Oct 15 21:49:06 2013 -0400
----------------------------------------------------------------------
.../org/apache/accumulo/test/functional/AccumuloInputFormatIT.java | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a9da4292/test/src/test/java/org/apache/accumulo/test/functional/AccumuloInputFormatIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/AccumuloInputFormatIT.java b/test/src/test/java/org/apache/accumulo/test/functional/AccumuloInputFormatIT.java
index 77769a5..67895d8 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/AccumuloInputFormatIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/AccumuloInputFormatIT.java
@@ -80,7 +80,6 @@ public class AccumuloInputFormatIT extends SimpleMacIT {
getConnector().tableOperations().offline(table);
splits = inputFormat.getSplits(job);
assertEquals(actualSplits.size(), splits.size());
->>>>>>> ACCUMULO-1751 Adding tests for autoAdjustRanges and offlineTable paths through getSplits().
// auto adjust ranges
ranges = new ArrayList<Range>();