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/7548cb71 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/7548cb71 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/7548cb71 Branch: refs/heads/master Commit: 7548cb71238799529cc09e1f55b96abeed0e4311 Parents: c1587d4 9fa4e0f Author: Christopher Tubbs <ctubb...@apache.org> Authored: Wed Apr 23 11:05:10 2014 -0400 Committer: Christopher Tubbs <ctubb...@apache.org> Committed: Wed Apr 23 11:05:10 2014 -0400 ---------------------------------------------------------------------- .../accumulo/core/file/rfile/CreateEmpty.java | 2 - .../monitor/servlets/trace/SummaryTest.java | 42 ++++++++++++++++++++ .../monitor/servlets/trace/SummaryTest.java | 42 -------------------- .../functional/RecoveryWithEmptyRFileIT.java | 24 +---------- 4 files changed, 44 insertions(+), 66 deletions(-) ----------------------------------------------------------------------
