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/2ba701e8 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/2ba701e8 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/2ba701e8 Branch: refs/heads/master Commit: 2ba701e878d0800af6d1e37edffa039f4e701118 Parents: 9c3aec8 6831e12 Author: Josh Elser <els...@apache.org> Authored: Fri Apr 4 21:45:58 2014 -0400 Committer: Josh Elser <els...@apache.org> Committed: Fri Apr 4 21:45:58 2014 -0400 ---------------------------------------------------------------------- .../monitor/servlets/trace/Summary.java | 21 ++++++++-- .../monitor/servlets/trace/SummaryTest.java | 42 ++++++++++++++++++++ 2 files changed, 60 insertions(+), 3 deletions(-) ----------------------------------------------------------------------
