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/be9cd71c Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/be9cd71c Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/be9cd71c Branch: refs/heads/master Commit: be9cd71c28fc51fb131ff6cbcab306b4d1c4dc8c Parents: abb545f a5a0552 Author: Sean Busbey <bus...@cloudera.com> Authored: Thu Mar 27 00:05:38 2014 -0500 Committer: Sean Busbey <bus...@cloudera.com> Committed: Thu Mar 27 00:05:38 2014 -0500 ---------------------------------------------------------------------- start/src/main/java/org/apache/accumulo/start/Main.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) ----------------------------------------------------------------------
