accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cjno...@apache.org
Subject git commit: ACCUMULO-1751 Bad merge line left in IT
Date Wed, 16 Oct 2013 01:49:07 GMT
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 <cjnolet@gmail.com>
Authored: Tue Oct 15 21:49:06 2013 -0400
Committer: Corey J. Nolet <cjnolet@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>();


Mime
View raw message