Merge branch '1.8'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/20ed2b01 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/20ed2b01 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/20ed2b01 Branch: refs/heads/master Commit: 20ed2b01f8f6a9376d0c7438c7f6e251ed61ef4e Parents: 9b0d9e8 def8f90 Author: Josh Elser <els...@apache.org> Authored: Fri Aug 26 11:39:48 2016 -0400 Committer: Josh Elser <els...@apache.org> Committed: Fri Aug 26 11:39:48 2016 -0400 ---------------------------------------------------------------------- TESTING.md | 23 +++++++++++++++++++- .../accumulo/gc/SimpleGarbageCollector.java | 2 +- .../java/org/apache/accumulo/master/Master.java | 4 ++-- .../org/apache/accumulo/monitor/Monitor.java | 4 ++-- .../org/apache/accumulo/tracer/TraceServer.java | 4 ++-- .../apache/accumulo/tserver/TabletServer.java | 4 ++-- 6 files changed, 31 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/20ed2b01/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/20ed2b01/server/master/src/main/java/org/apache/accumulo/master/Master.java ----------------------------------------------------------------------
