Merge branch '1.6.0-SNAPSHOT'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/040da03b Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/040da03b Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/040da03b Branch: refs/heads/master Commit: 040da03b75b5fffaf8069d4cb9cbe7429754a0cd Parents: c9f52fa 18fa298 Author: Mike Drob <md...@cloudera.com> Authored: Fri Apr 11 12:36:40 2014 -0400 Committer: Mike Drob <md...@cloudera.com> Committed: Fri Apr 11 12:36:40 2014 -0400 ---------------------------------------------------------------------- .../apache/accumulo/tserver/log/DfsLogger.java | 22 +++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/040da03b/server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java ---------------------------------------------------------------------- diff --cc server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java index 571d46e,c960bd6..d4df00d --- a/server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java +++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java @@@ -26,9 -26,9 +26,10 @@@ import java.io.DataInputStream import java.io.DataOutputStream; import java.io.IOException; import java.io.OutputStream; + import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.nio.channels.ClosedChannelException; +import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections;
