Merge branch '1.6'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/8fae3f80 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/8fae3f80 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/8fae3f80 Branch: refs/heads/master Commit: 8fae3f8060afff6c1ac7b5dac27365f3fa32b95c Parents: 27f3b30 6605ad4 Author: Josh Elser <els...@apache.org> Authored: Thu Apr 9 12:04:47 2015 -0400 Committer: Josh Elser <els...@apache.org> Committed: Thu Apr 9 12:04:47 2015 -0400 ---------------------------------------------------------------------- .../main/java/org/apache/accumulo/cluster/RemoteShellOptions.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ----------------------------------------------------------------------
