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/ac28b225 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/ac28b225 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/ac28b225 Branch: refs/heads/master Commit: ac28b2253f7165c088472de55562a79e4fce8cf0 Parents: 33a094d da9e0f4 Author: Josh Elser <els...@apache.org> Authored: Mon Jan 6 21:44:34 2014 -0500 Committer: Josh Elser <els...@apache.org> Committed: Mon Jan 6 21:44:34 2014 -0500 ---------------------------------------------------------------------- .../accumulo/gc/SimpleGarbageCollector.java | 4 +- .../test/functional/GarbageCollectorIT.java | 78 ++++++++++++++++++-- 2 files changed, 74 insertions(+), 8 deletions(-) ----------------------------------------------------------------------