Return-Path: X-Original-To: apmail-accumulo-commits-archive@www.apache.org Delivered-To: apmail-accumulo-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 985961037D for ; Fri, 11 Apr 2014 16:37:19 +0000 (UTC) Received: (qmail 56288 invoked by uid 500); 11 Apr 2014 16:37:18 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 56212 invoked by uid 500); 11 Apr 2014 16:37:17 -0000 Mailing-List: contact commits-help@accumulo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@accumulo.apache.org Delivered-To: mailing list commits@accumulo.apache.org Received: (qmail 55994 invoked by uid 99); 11 Apr 2014 16:37:11 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 11 Apr 2014 16:37:11 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 60AC898AE04; Fri, 11 Apr 2014 16:37:10 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: mdrob@apache.org To: commits@accumulo.apache.org Date: Fri, 11 Apr 2014 16:37:12 -0000 Message-Id: <097b43af72e24f54b6070afbbc17dd49@git.apache.org> In-Reply-To: <82566f3011db403686b63bb17b007299@git.apache.org> References: <82566f3011db403686b63bb17b007299@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/3] git commit: Merge branch '1.6.0-SNAPSHOT' 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 Authored: Fri Apr 11 12:36:40 2014 -0400 Committer: Mike Drob 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;