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/39f14472 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/39f14472 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/39f14472 Branch: refs/heads/master Commit: 39f14472b109170c8434de0b7d4cadf7473dbd1f Parents: 52ba24e 89d69f6 Author: Eric C. Newton <eric.new...@gmail.com> Authored: Tue Oct 20 16:15:07 2015 -0400 Committer: Eric C. Newton <eric.new...@gmail.com> Committed: Tue Oct 20 16:15:07 2015 -0400 ---------------------------------------------------------------------- .../accumulo/gc/GarbageCollectionAlgorithm.java | 16 +++++++++------- .../accumulo/gc/GarbageCollectionEnvironment.java | 6 ++++-- .../apache/accumulo/gc/SimpleGarbageCollector.java | 10 ++++------ .../apache/accumulo/gc/GarbageCollectionTest.java | 5 ++--- 4 files changed, 19 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/39f14472/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java ----------------------------------------------------------------------
