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/1c7159e5 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/1c7159e5 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/1c7159e5 Branch: refs/heads/master Commit: 1c7159e5b27db717382ce6191583b61d0ae1547a Parents: 5724ac9 472f484 Author: Josh Elser <els...@apache.org> Authored: Wed Jan 8 00:05:44 2014 -0500 Committer: Josh Elser <els...@apache.org> Committed: Wed Jan 8 00:05:44 2014 -0500 ---------------------------------------------------------------------- bin/accumulo | 11 +++++++++++ bin/config.sh | 20 ++++++++++++++++++++ 2 files changed, 31 insertions(+) ----------------------------------------------------------------------
