Merge remote-tracking branch 'origin/1.6.0-SNAPSHOT' into ACCUMULO-2061
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/3eb1593a Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3eb1593a Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/3eb1593a Branch: refs/heads/ACCUMULO-2061 Commit: 3eb1593a450e89851a518aa5dccd454753442824 Parents: e97b093 da7f937 Author: Josh Elser <els...@apache.org> Authored: Mon Mar 10 18:31:37 2014 -0400 Committer: Josh Elser <els...@apache.org> Committed: Mon Mar 10 18:31:37 2014 -0400 ---------------------------------------------------------------------- .../apache/accumulo/core/util/shell/Shell.java | 20 +-- .../core/util/shell/ShellConfigTest.java | 5 +- .../core/util/shell/ShellSetInstanceTest.java | 3 +- .../accumulo/core/util/shell/ShellTest.java | 5 +- .../chapters/troubleshooting.tex | 29 ++++ .../apache/accumulo/proxy/SimpleProxyIT.java | 98 +++++++++---- .../org/apache/accumulo/test/DeleteRowsIT.java | 42 ++++++ .../org/apache/accumulo/test/ShellServerIT.java | 145 ++++++++++++++----- .../apache/accumulo/test/TestDeleteRowsIT.java | 42 ------ 9 files changed, 267 insertions(+), 122 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/3eb1593a/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java ----------------------------------------------------------------------
