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/4d6925de Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4d6925de Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/4d6925de Branch: refs/heads/master Commit: 4d6925defde54f9dc2f5c8946cbfeeb8e3b0bf87 Parents: 644d518 ff9bfeb Author: Billie Rinaldi <billie.rina...@gmail.com> Authored: Wed Nov 13 08:44:39 2013 -0800 Committer: Billie Rinaldi <billie.rina...@gmail.com> Committed: Wed Nov 13 08:44:39 2013 -0800 ---------------------------------------------------------------------- .../core/util/shell/ShellConfigTest.java | 2 +- .../server/util/MasterMetadataUtil.java | 3 +- .../accumulo/server/util/MetadataTableUtil.java | 2 +- .../gc/GarbageCollectWriteAheadLogs.java | 34 ++++++++++++-------- .../apache/accumulo/tserver/log/DfsLogger.java | 5 ++- 5 files changed, 27 insertions(+), 19 deletions(-) ----------------------------------------------------------------------
