Merge branch '1.7'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/1dd6b704 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/1dd6b704 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/1dd6b704 Branch: refs/heads/master Commit: 1dd6b704ab415dc6c02c69a72803645eb7d5c404 Parents: 978e621 acef2e5 Author: Josh Elser <els...@apache.org> Authored: Thu Jul 2 18:17:08 2015 -0400 Committer: Josh Elser <els...@apache.org> Committed: Thu Jul 2 18:17:08 2015 -0400 ---------------------------------------------------------------------- .../java/org/apache/accumulo/shell/mock/MockShell.java | 11 +++++++++++ 1 file changed, 11 insertions(+) ----------------------------------------------------------------------