accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From els...@apache.org
Subject [3/3] git commit: Merge branch '1.6'
Date Thu, 09 Oct 2014 23:17:17 GMT
Merge branch '1.6'

Conflicts:
	server/master/src/main/java/org/apache/accumulo/master/tableOps/ImportTable.java


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/556b17c6
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/556b17c6
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/556b17c6

Branch: refs/heads/master
Commit: 556b17c635248e6d7c871761d281893228515f35
Parents: 837ce17 ff1ceea
Author: Josh Elser <elserj@apache.org>
Authored: Thu Oct 9 19:17:02 2014 -0400
Committer: Josh Elser <elserj@apache.org>
Committed: Thu Oct 9 19:17:02 2014 -0400

----------------------------------------------------------------------
 .../accumulo/master/tableOps/ImportTable.java   |  23 ++-
 .../apache/accumulo/test/ImportExportIT.java    | 163 +++++++++++++++++++
 2 files changed, 180 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/556b17c6/server/master/src/main/java/org/apache/accumulo/master/tableOps/ImportTable.java
----------------------------------------------------------------------
diff --cc server/master/src/main/java/org/apache/accumulo/master/tableOps/ImportTable.java
index 9857137,e57c689..1129ede
--- a/server/master/src/main/java/org/apache/accumulo/master/tableOps/ImportTable.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/tableOps/ImportTable.java
@@@ -24,7 -24,7 +24,8 @@@ import java.io.IOException
  import java.io.InputStreamReader;
  import java.io.OutputStreamWriter;
  import java.io.Serializable;
 +import java.nio.charset.StandardCharsets;
+ import java.util.Arrays;
  import java.util.HashMap;
  import java.util.Map;
  import java.util.Map.Entry;


Mime
View raw message