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/7345b833 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/7345b833 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/7345b833 Branch: refs/heads/master Commit: 7345b83330e92bac51fcf891df2e27112011a414 Parents: 4cffb74 9a81ca2 Author: Josh Elser <els...@apache.org> Authored: Mon Jan 13 12:46:42 2014 -0500 Committer: Josh Elser <els...@apache.org> Committed: Mon Jan 13 12:46:42 2014 -0500 ---------------------------------------------------------------------- .../minicluster/MiniAccumuloCluster.java | 5 +- .../monitor/servlets/DefaultServlet.java | 2 +- .../test/functional/GarbageCollectorIT.java | 122 +++++++++++-------- 3 files changed, 75 insertions(+), 54 deletions(-) ----------------------------------------------------------------------
