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/92077a80 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/92077a80 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/92077a80 Branch: refs/heads/master Commit: 92077a8023fe522a6df8cd12737ee368fe9a0d5f Parents: 82d0555 30938af Author: Josh Elser <els...@apache.org> Authored: Fri Dec 20 00:57:26 2013 -0500 Committer: Josh Elser <els...@apache.org> Committed: Fri Dec 20 00:57:26 2013 -0500 ---------------------------------------------------------------------- bin/config.sh | 5 +++++ 1 file changed, 5 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/92077a80/bin/config.sh ----------------------------------------------------------------------
