You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by el...@apache.org on 2014/01/13 18:58:36 UTC

[11/11] git commit: Merge branch '1.6.0-SNAPSHOT'

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 <el...@apache.org>
Authored: Mon Jan 13 12:46:42 2014 -0500
Committer: Josh Elser <el...@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(-)
----------------------------------------------------------------------