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/d60a38c0 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d60a38c0 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/d60a38c0 Branch: refs/heads/master Commit: d60a38c0853e9cc920d99ba340cbd9cb7ea6e899 Parents: 5a58538 bfa20dd Author: Josh Elser <els...@apache.org> Authored: Mon Feb 10 14:08:44 2014 -0500 Committer: Josh Elser <els...@apache.org> Committed: Mon Feb 10 14:08:44 2014 -0500 ---------------------------------------------------------------------- bin/config.sh | 9 +++++++++ 1 file changed, 9 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/d60a38c0/bin/config.sh ----------------------------------------------------------------------