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/6a78fbd5 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/6a78fbd5 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/6a78fbd5 Branch: refs/heads/master Commit: 6a78fbd56f28156cc071e07334b2a3487ce41e78 Parents: 9f25d06 7c30909 Author: Eric Newton <eric.new...@gmail.com> Authored: Fri Jan 10 16:37:36 2014 -0500 Committer: Eric Newton <eric.new...@gmail.com> Committed: Fri Jan 10 16:37:36 2014 -0500 ---------------------------------------------------------------------- .../apache/accumulo/tserver/log/DfsLogger.java | 56 +++++++++----------- .../tserver/log/TabletServerLogger.java | 4 +- 2 files changed, 28 insertions(+), 32 deletions(-) ----------------------------------------------------------------------