Merge remote-tracking branch 'origin/1.6' into 1.6
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/f66b9a0d Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f66b9a0d Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/f66b9a0d Branch: refs/heads/master Commit: f66b9a0d18cde88bdc269421527ebc5a35445dda Parents: 561f189 31a2224 Author: Josh Elser <els...@apache.org> Authored: Mon Jun 20 23:28:49 2016 -0400 Committer: Josh Elser <els...@apache.org> Committed: Mon Jun 20 23:28:49 2016 -0400 ---------------------------------------------------------------------- pom.xml | 2 +- .../org/apache/accumulo/gc/GarbageCollectWriteAheadLogs.java | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) ----------------------------------------------------------------------
