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/c29df8ef Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/c29df8ef Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/c29df8ef Branch: refs/heads/master Commit: c29df8ef00e0d664e7e9b5f59057fd91788323e7 Parents: 0cecf03 c45b96c Author: Eric Newton <eric.new...@gmail.com> Authored: Wed Dec 4 17:16:07 2013 -0500 Committer: Eric Newton <eric.new...@gmail.com> Committed: Wed Dec 4 17:16:07 2013 -0500 ---------------------------------------------------------------------- bin/config.sh | 67 +++++++++++++++++++++++++++++++++++++----------------- 1 file changed, 46 insertions(+), 21 deletions(-) ----------------------------------------------------------------------
