Merge remote-tracking branch 'origin/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/4deaf92e Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4deaf92e Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/4deaf92e Branch: refs/heads/master Commit: 4deaf92e51084c1216c1d188a6f91c9bc0ba269e Parents: 13759ef cbb4219 Author: Keith Turner <ktur...@apache.org> Authored: Wed Dec 4 15:44:51 2013 -0500 Committer: Keith Turner <ktur...@apache.org> Committed: Wed Dec 4 15:44:51 2013 -0500 ---------------------------------------------------------------------- bin/config.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/4deaf92e/bin/config.sh ----------------------------------------------------------------------
