Merge branch '1.5.2-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/69605702 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/69605702 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/69605702 Branch: refs/heads/master Commit: 6960570252751a6a2fcda6da19755462405f6116 Parents: b3f6e0f e3e03be Author: Josh Elser <els...@apache.org> Authored: Fri Apr 4 12:32:24 2014 -0400 Committer: Josh Elser <els...@apache.org> Committed: Fri Apr 4 12:32:24 2014 -0400 ---------------------------------------------------------------------- bin/accumulo | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/69605702/bin/accumulo ----------------------------------------------------------------------
