Merge branch '1.6.1-SNAPSHOT'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/97cac218 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/97cac218 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/97cac218 Branch: refs/heads/ACCUMULO-378 Commit: 97cac218c388af359d51544493a0580be0252a8b Parents: 9fcaace 1b170e8 Author: Mike Drob <md...@cloudera.com> Authored: Wed Jun 11 11:52:48 2014 -0400 Committer: Mike Drob <md...@cloudera.com> Committed: Wed Jun 11 11:52:48 2014 -0400 ---------------------------------------------------------------------- bin/config.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) ----------------------------------------------------------------------
