[6/6] git commit: Merge branch '1.6.0-SNAPSHOT'

[vines]

Merge branch '1.6.0-SNAPSHOT'

Conflicts:
        
core/src/test/java/org/apache/accumulo/core/security/crypto/BlockedIOStreamTest.java


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

Branch: refs/heads/master
Commit: 94008f6a1235edf178294effc7623576a249cdb4
Parents: 8aedbe6 0550720
Author: John Vines <vi...@apache.org>
Authored: Fri Apr 18 10:42:51 2014 -0400
Committer: John Vines <vi...@apache.org>
Committed: Fri Apr 18 10:42:51 2014 -0400

----------------------------------------------------------------------
 .../security/crypto/BlockedOutputStream.java    | 17 +++---
 .../security/crypto/NoFlushOutputStream.java    | 10 +--
 .../security/crypto/BlockedIOStreamTest.java    | 64 +++++++++++++++++---
 .../apache/accumulo/tserver/log/DfsLogger.java  |  9 ++-
 4 files changed, 72 insertions(+), 28 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/94008f6a/core/src/test/java/org/apache/accumulo/core/security/crypto/BlockedIOStreamTest.java
----------------------------------------------------------------------
diff --cc 
core/src/test/java/org/apache/accumulo/core/security/crypto/BlockedIOStreamTest.java
index 8ea55a6,212aaaf..d80124c
--- 
a/core/src/test/java/org/apache/accumulo/core/security/crypto/BlockedIOStreamTest.java
+++ 
b/core/src/test/java/org/apache/accumulo/core/security/crypto/BlockedIOStreamTest.java
@@@ -16,15 -16,18 +16,17 @@@
   */
  package org.apache.accumulo.core.security.crypto;
  
 -import static org.junit.Assert.assertEquals;
+ import static org.junit.Assert.assertArrayEquals;
 +import static org.junit.Assert.assertEquals;
  
  import java.io.ByteArrayInputStream;
  import java.io.ByteArrayOutputStream;
  import java.io.DataInputStream;
  import java.io.IOException;
 +import java.nio.charset.StandardCharsets;
+ import java.util.Arrays;
  import java.util.Random;
  
 -import org.apache.accumulo.core.Constants;
 -import org.apache.commons.lang.ArrayUtils;
  import org.junit.Test;
  
  public class BlockedIOStreamTest {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/94008f6a/server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java
----------------------------------------------------------------------