Merge branch '1.6.1-SNAPSHOT'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/8ce0b687 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/8ce0b687 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/8ce0b687 Branch: refs/heads/master Commit: 8ce0b687fdc9da5986558d1aad0353cb0bcd67a2 Parents: 7eabcb6 0356387 Author: Mike Drob <md...@cloudera.com> Authored: Tue Jun 10 13:27:27 2014 -0400 Committer: Mike Drob <md...@cloudera.com> Committed: Tue Jun 10 13:27:27 2014 -0400 ---------------------------------------------------------------------- bin/start-server.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) ----------------------------------------------------------------------