Merge branch '1.6.1-SNAPSHOT'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/d37f05f6 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d37f05f6 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/d37f05f6 Branch: refs/heads/master Commit: d37f05f652cce435fa706f26a0b81a4da5d93015 Parents: 9f357e6 eb6b325 Author: Josh Elser <els...@apache.org> Authored: Fri May 23 20:30:49 2014 -0400 Committer: Josh Elser <els...@apache.org> Committed: Fri May 23 20:30:49 2014 -0400 ---------------------------------------------------------------------- .../accumulo/monitor/servlets/ShellServlet.java | 43 +++++++++++++++----- 1 file changed, 33 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/d37f05f6/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/ShellServlet.java ---------------------------------------------------------------------- diff --cc server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/ShellServlet.java index 25e9e33,665b132..bf38064 --- a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/ShellServlet.java +++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/ShellServlet.java @@@ -21,9 -21,9 +21,10 @@@ import java.io.InputStream import java.io.OutputStream; import java.io.OutputStreamWriter; import java.io.PrintWriter; +import java.nio.charset.StandardCharsets; import java.util.HashMap; import java.util.Map; + import java.util.UUID; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors;
