Merge branch '1.5.1-SNAPSHOT' into 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/13759eff Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/13759eff Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/13759eff Branch: refs/heads/master Commit: 13759eff645d7074e0c85c0711f6f11e873daa66 Parents: b07d129 db1cc47 Author: Keith Turner <ktur...@apache.org> Authored: Wed Dec 4 14:53:43 2013 -0500 Committer: Keith Turner <ktur...@apache.org> Committed: Wed Dec 4 14:53:43 2013 -0500 ---------------------------------------------------------------------- bin/config.sh | 67 ++++++++++++++++++++++++++++++++++++++---------------- 1 file changed, 47 insertions(+), 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/13759eff/bin/config.sh ----------------------------------------------------------------------
