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