[accumulo] 01/01: Merge branch '2.0'

[ctubbsii]

This is an automated email from the ASF dual-hosted git repository.

ctubbsii pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo.git

commit c876275d421d8e4bf3f22321294f0cf4a72caad1
Merge: f39c2fe 6ae7ddb
Author: Christopher Tubbs <ctubb...@apache.org>
AuthorDate: Thu Aug 15 15:45:42 2019 -0400

    Merge branch '2.0'

 .../accumulo/gc/GarbageCollectWriteAheadLogs.java      | 10 ++++------
 .../org/apache/accumulo/gc/SimpleGarbageCollector.java | 15 ++++++++++++++-
 .../accumulo/gc/GarbageCollectWriteAheadLogsTest.java  | 18 ++++++++++++++++++
 3 files changed, 36 insertions(+), 7 deletions(-)

diff --cc 
server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectWriteAheadLogs.java
index 5637a8d,e671219..2858bf6
--- 
a/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectWriteAheadLogs.java
+++ 
b/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectWriteAheadLogs.java
@@@ -89,13 -90,9 +90,9 @@@ public class GarbageCollectWriteAheadLo
      this.context = context;
      this.fs = fs;
      this.useTrash = useTrash;
-     this.liveServers = new LiveTServerSet(context, (current, deleted, added) 
-> {
-       log.debug("New tablet servers noticed: {}", added);
-       log.debug("Tablet servers removed: {}", deleted);
-     });
-     liveServers.startListeningForTabletServerChanges();
+     this.liveServers = liveServers;
      this.walMarker = new WalStateManager(context);
 -    this.store = () -> Iterators.concat(new 
ZooTabletStateStore(context).iterator(),
 +    this.store = () -> Iterators.concat(new 
ZooTabletStateStore(context.getAmple()).iterator(),
          new RootTabletStateStore(context).iterator(), new 
MetaDataStateStore(context).iterator());
    }