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/eb72c5ba Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/eb72c5ba Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/eb72c5ba Branch: refs/heads/master Commit: eb72c5ba0831c5fafe01ac30a7e53f48eefcdba5 Parents: 111b56d ce38eea Author: Josh Elser <els...@apache.org> Authored: Tue Mar 25 16:07:56 2014 -0700 Committer: Josh Elser <els...@apache.org> Committed: Tue Mar 25 16:07:56 2014 -0700 ---------------------------------------------------------------------- .../test/java/org/apache/accumulo/core/util/shell/ShellTest.java | 2 ++ 1 file changed, 2 insertions(+) ----------------------------------------------------------------------