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/b4aee0da Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/b4aee0da Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/b4aee0da Branch: refs/heads/master Commit: b4aee0daa40aa4493dadcd785a5b359e6100319a Parents: de79c0c 4313ff8 Author: Josh Elser <els...@apache.org> Authored: Sat Jan 4 14:27:30 2014 -0500 Committer: Josh Elser <els...@apache.org> Committed: Sat Jan 4 14:27:30 2014 -0500 ---------------------------------------------------------------------- .../java/org/apache/accumulo/minicluster/MiniAccumuloCluster.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ----------------------------------------------------------------------
