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/81861db9 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/81861db9 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/81861db9 Branch: refs/heads/1.6.0-SNAPSHOT Commit: 81861db9ca39e6d9de37d7c05dc9304c0931e725 Parents: b0d056e 060188a Author: Eric Newton <eric.new...@gmail.com> Authored: Thu Nov 7 13:51:43 2013 -0500 Committer: Eric Newton <eric.new...@gmail.com> Committed: Thu Nov 7 13:51:43 2013 -0500 ---------------------------------------------------------------------- bin/config.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/81861db9/bin/config.sh ----------------------------------------------------------------------
