Merge branch '1.7'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/46f76023 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/46f76023 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/46f76023 Branch: refs/heads/master Commit: 46f76023b93b23f27f55d9ac1833b0f7072609b4 Parents: 8cbaa05 2938cfa Author: Josh Elser <els...@apache.org> Authored: Wed May 6 16:25:34 2015 -0400 Committer: Josh Elser <els...@apache.org> Committed: Wed May 6 16:25:34 2015 -0400 ---------------------------------------------------------------------- .../standalone/StandaloneClusterControl.java | 4 +- .../gc/GarbageCollectWriteAheadLogs.java | 146 +++++++++++----- .../gc/GarbageCollectWriteAheadLogsTest.java | 168 +++++++++++++++++++ 3 files changed, 278 insertions(+), 40 deletions(-) ----------------------------------------------------------------------
