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/e716e496 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/e716e496 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/e716e496 Branch: refs/heads/master Commit: e716e496301f6c7e7b5bd58ffb66883e7d2dc785 Parents: 1e2853d 75aac15 Author: Josh Elser <els...@apache.org> Authored: Thu Feb 13 19:27:53 2014 -0500 Committer: Josh Elser <els...@apache.org> Committed: Thu Feb 13 19:27:53 2014 -0500 ---------------------------------------------------------------------- .../client/mapreduce/AbstractInputFormat.java | 12 +++- .../client/mapreduce/AccumuloInputFormat.java | 2 +- .../AccumuloMultiTableInputFormat.java | 2 +- .../monitor/servlets/DefaultServlet.java | 70 ++++++++++++++------ 4 files changed, 64 insertions(+), 22 deletions(-) ----------------------------------------------------------------------
