You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by el...@apache.org on 2015/03/31 06:00:21 UTC
[5/5] accumulo git commit: Merge branch '1.6'
Merge branch '1.6'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/5cd14aa1
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/5cd14aa1
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/5cd14aa1
Branch: refs/heads/master
Commit: 5cd14aa1c57bdd197c7336aa42274e139104fd10
Parents: 139c002 82ec9c1
Author: Josh Elser <el...@apache.org>
Authored: Mon Mar 30 23:20:24 2015 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Mon Mar 30 23:20:24 2015 -0400
----------------------------------------------------------------------
.../core/client/mapred/AccumuloFileOutputFormatTest.java | 6 ++++--
.../accumulo/core/client/mapred/AccumuloInputFormatTest.java | 5 ++++-
.../core/client/mapred/AccumuloMultiTableInputFormatTest.java | 7 +++++--
.../accumulo/core/client/mapred/AccumuloOutputFormatTest.java | 7 +++++--
.../core/client/mapred/AccumuloRowInputFormatTest.java | 7 +++++--
.../org/apache/accumulo/core/client/mapred/TokenFileTest.java | 1 +
.../core/client/mapreduce/AccumuloFileOutputFormatTest.java | 6 ++++--
.../core/client/mapreduce/AccumuloInputFormatTest.java | 6 ++++--
.../client/mapreduce/AccumuloMultiTableInputFormatTest.java | 7 +++++--
.../core/client/mapreduce/AccumuloOutputFormatTest.java | 7 +++++--
.../core/client/mapreduce/AccumuloRowInputFormatTest.java | 7 +++++--
.../apache/accumulo/core/client/mapreduce/TokenFileTest.java | 1 +
.../examples/simple/filedata/ChunkInputFormatTest.java | 5 ++++-
13 files changed, 52 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/5cd14aa1/core/src/test/java/org/apache/accumulo/core/client/mapred/AccumuloFileOutputFormatTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/5cd14aa1/core/src/test/java/org/apache/accumulo/core/client/mapred/AccumuloRowInputFormatTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/5cd14aa1/core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloFileOutputFormatTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/5cd14aa1/core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloInputFormatTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/5cd14aa1/core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloMultiTableInputFormatTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/5cd14aa1/core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormatTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/5cd14aa1/core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloRowInputFormatTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/5cd14aa1/core/src/test/java/org/apache/accumulo/core/client/mapreduce/TokenFileTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/5cd14aa1/examples/simple/src/test/java/org/apache/accumulo/examples/simple/filedata/ChunkInputFormatTest.java
----------------------------------------------------------------------
diff --cc examples/simple/src/test/java/org/apache/accumulo/examples/simple/filedata/ChunkInputFormatTest.java
index e908a59,82ad02f..b95c00c
--- a/examples/simple/src/test/java/org/apache/accumulo/examples/simple/filedata/ChunkInputFormatTest.java
+++ b/examples/simple/src/test/java/org/apache/accumulo/examples/simple/filedata/ChunkInputFormatTest.java
@@@ -21,8 -20,8 +21,9 @@@ import static org.junit.Assert.assertFa
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+ import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList;