accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ctubb...@apache.org
Subject [6/6] accumulo git commit: Merge branch '1.8'
Date Mon, 09 May 2016 22:44:32 GMT
Merge branch '1.8'

Conflicts:
	shell/src/test/java/org/apache/accumulo/shell/ShellUtilTest.java


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

Branch: refs/heads/master
Commit: 8e789f61d49675231d9188fde53e3ff77e4d7ffc
Parents: 7c812c3 9dec120
Author: Christopher Tubbs <ctubbsii@apache.org>
Authored: Mon May 9 18:44:09 2016 -0400
Committer: Christopher Tubbs <ctubbsii@apache.org>
Committed: Mon May 9 18:44:09 2016 -0400

----------------------------------------------------------------------
 .../test/java/org/apache/accumulo/shell/ShellUtilTest.java    | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/8e789f61/shell/src/test/java/org/apache/accumulo/shell/ShellUtilTest.java
----------------------------------------------------------------------
diff --cc shell/src/test/java/org/apache/accumulo/shell/ShellUtilTest.java
index d72477c,28e56ab..00b5205
--- a/shell/src/test/java/org/apache/accumulo/shell/ShellUtilTest.java
+++ b/shell/src/test/java/org/apache/accumulo/shell/ShellUtilTest.java
@@@ -40,7 -40,7 +40,8 @@@ public class ShellUtilTest 
  
    // String with 3 lines, with one empty line
    private static final String FILEDATA = "line1\n\nline2";
-   private static final String B64_FILEDATA = "bGluZTE=\n\nbGluZTI=";
 -  private static final String B64_FILEDATA = Base64.encodeBase64String("line1".getBytes(UTF_8))
+ "\n\n" + Base64.encodeBase64String("line2".getBytes(UTF_8));
++  private static final String B64_FILEDATA = Base64.getEncoder().encodeToString("line1".getBytes(UTF_8))
+ "\n\n"
++      + Base64.getEncoder().encodeToString("line2".getBytes(UTF_8));
  
    @Test
    public void testWithoutDecode() throws IOException {


Mime
View raw message