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/240436e6 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/240436e6 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/240436e6 Branch: refs/heads/master Commit: 240436e6ae2bf7139041bb3116369fc164b136dd Parents: eaa2f28 c70d14e Author: Josh Elser <els...@apache.org> Authored: Tue Nov 26 21:13:02 2013 -0500 Committer: Josh Elser <els...@apache.org> Committed: Tue Nov 26 21:13:02 2013 -0500 ---------------------------------------------------------------------- .../java/org/apache/accumulo/minicluster/MiniAccumuloCluster.java | 2 +- test/system/continuous/continuous-env.sh.example | 1 + test/system/continuous/start-agitator.sh | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
