Return-Path: <commits-return-18373-archive-asf-public=cust-asf.ponee.io@accumulo.apache.org>
X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io
Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io
Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183])
	by cust-asf2.ponee.io (Postfix) with ESMTP id 4F752200B50
	for <archive-asf-public-internal@cust-asf2.ponee.io>; Tue, 21 Jun 2016 01:49:56 +0200 (CEST)
Received: by cust-asf.ponee.io (Postfix)
	id 4E2E5160A55; Mon, 20 Jun 2016 23:49:56 +0000 (UTC)
Delivered-To: archive-asf-public@cust-asf.ponee.io
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by cust-asf.ponee.io (Postfix) with SMTP id 0BB29160A6C
	for <archive-asf-public@cust-asf.ponee.io>; Tue, 21 Jun 2016 01:49:54 +0200 (CEST)
Received: (qmail 15282 invoked by uid 500); 20 Jun 2016 23:49:54 -0000
Mailing-List: contact commits-help@accumulo.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@accumulo.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@accumulo.apache.org>
List-Post: <mailto:commits@accumulo.apache.org>
List-Id: <commits.accumulo.apache.org>
Reply-To: dev@accumulo.apache.org
Delivered-To: mailing list commits@accumulo.apache.org
Received: (qmail 14713 invoked by uid 99); 20 Jun 2016 23:49:54 -0000
Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 20 Jun 2016 23:49:54 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33)
	id 87A75ED30C; Mon, 20 Jun 2016 23:49:53 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: ctubbsii@apache.org
To: commits@accumulo.apache.org
Date: Mon, 20 Jun 2016 23:50:01 -0000
Message-Id: <63ea5e5c1ab54e948ad7dc30ec4e733b@git.apache.org>
In-Reply-To: <2c754b2c4aab49d89c626af41b84d51f@git.apache.org>
References: <2c754b2c4aab49d89c626af41b84d51f@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [09/23] accumulo git commit: Merge branch '1.6' into 1.7
archived-at: Mon, 20 Jun 2016 23:49:56 -0000

Merge branch '1.6' into 1.7

Conflicts:
	server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectWriteAheadLogs.java


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/2e4eddda
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/2e4eddda
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/2e4eddda

Branch: refs/heads/1.8
Commit: 2e4eddda2d08f170f769b5d15eb2df7880e96c19
Parents: 7b92053 31a2224
Author: Christopher Tubbs <ctubbsii@apache.org>
Authored: Mon Jun 20 17:24:25 2016 -0400
Committer: Christopher Tubbs <ctubbsii@apache.org>
Committed: Mon Jun 20 17:24:25 2016 -0400

----------------------------------------------------------------------
 pom.xml                                                     | 2 +-
 .../apache/accumulo/gc/GarbageCollectWriteAheadLogs.java    | 9 ++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/2e4eddda/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index 20484ce,9b67614..27bed62
--- a/pom.xml
+++ b/pom.xml
@@@ -159,14 -156,9 +159,14 @@@
          <version>1.32</version>
        </dependency>
        <dependency>
 +        <groupId>com.google.auto.service</groupId>
 +        <artifactId>auto-service</artifactId>
 +        <version>1.0-rc2</version>
 +      </dependency>
 +      <dependency>
          <groupId>com.google.code.gson</groupId>
          <artifactId>gson</artifactId>
-         <version>2.2.2</version>
+         <version>2.2.4</version>
        </dependency>
        <!-- Hadoop-2.4.0 MiniDFSCluster uses classes dropped in Guava 15 -->
        <dependency>

http://git-wip-us.apache.org/repos/asf/accumulo/blob/2e4eddda/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectWriteAheadLogs.java
----------------------------------------------------------------------
diff --cc server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectWriteAheadLogs.java
index a62ffb2,a22a34e..b57b8fc
--- a/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectWriteAheadLogs.java
+++ b/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectWriteAheadLogs.java
@@@ -28,63 -27,44 +27,63 @@@ import java.util.Map
  import java.util.Map.Entry;
  import java.util.Set;
  import java.util.UUID;
+ import java.util.concurrent.TimeUnit;
  
  import org.apache.accumulo.core.Constants;
 +import org.apache.accumulo.core.client.AccumuloException;
 +import org.apache.accumulo.core.client.AccumuloSecurityException;
 +import org.apache.accumulo.core.client.Connector;
  import org.apache.accumulo.core.client.Instance;
 +import org.apache.accumulo.core.client.Scanner;
 +import org.apache.accumulo.core.client.TableNotFoundException;
+ import org.apache.accumulo.core.conf.AccumuloConfiguration;
+ import org.apache.accumulo.core.conf.Property;
 +import org.apache.accumulo.core.data.Key;
 +import org.apache.accumulo.core.data.Range;
 +import org.apache.accumulo.core.data.Value;
  import org.apache.accumulo.core.gc.thrift.GCStatus;
  import org.apache.accumulo.core.gc.thrift.GcCycleStats;
 +import org.apache.accumulo.core.metadata.MetadataTable;
 +import org.apache.accumulo.core.metadata.schema.MetadataSchema.ReplicationSection;
 +import org.apache.accumulo.core.protobuf.ProtobufUtil;
 +import org.apache.accumulo.core.replication.ReplicationSchema.StatusSection;
 +import org.apache.accumulo.core.replication.ReplicationTable;
 +import org.apache.accumulo.core.replication.ReplicationTableOfflineException;
 +import org.apache.accumulo.core.rpc.ThriftUtil;
 +import org.apache.accumulo.core.security.Authorizations;
  import org.apache.accumulo.core.tabletserver.log.LogEntry;
  import org.apache.accumulo.core.tabletserver.thrift.TabletClientService;
  import org.apache.accumulo.core.tabletserver.thrift.TabletClientService.Client;
 +import org.apache.accumulo.core.trace.Span;
 +import org.apache.accumulo.core.trace.Trace;
 +import org.apache.accumulo.core.trace.Tracer;
  import org.apache.accumulo.core.util.AddressUtil;
 -import org.apache.accumulo.core.util.ThriftUtil;
  import org.apache.accumulo.core.zookeeper.ZooUtil;
 +import org.apache.accumulo.server.AccumuloServerContext;
  import org.apache.accumulo.server.ServerConstants;
 -import org.apache.accumulo.server.conf.ServerConfiguration;
  import org.apache.accumulo.server.fs.VolumeManager;
 -import org.apache.accumulo.server.security.SystemCredentials;
 +import org.apache.accumulo.server.replication.StatusUtil;
 +import org.apache.accumulo.server.replication.proto.Replication.Status;
  import org.apache.accumulo.server.util.MetadataTableUtil;
  import org.apache.accumulo.server.zookeeper.ZooReaderWriter;
 -import org.apache.accumulo.trace.instrument.Span;
 -import org.apache.accumulo.trace.instrument.Trace;
 -import org.apache.accumulo.trace.instrument.Tracer;
  import org.apache.hadoop.fs.FileStatus;
  import org.apache.hadoop.fs.Path;
 -import org.apache.log4j.Logger;
  import org.apache.thrift.TException;
  import org.apache.zookeeper.KeeperException;
 +import org.slf4j.Logger;
 +import org.slf4j.LoggerFactory;
  
+ import com.google.common.annotations.VisibleForTesting;
 +import com.google.common.collect.Iterables;
  import com.google.common.net.HostAndPort;
 +import com.google.protobuf.InvalidProtocolBufferException;
- import java.util.concurrent.TimeUnit;
- import org.apache.accumulo.core.conf.AccumuloConfiguration;
- import org.apache.accumulo.core.conf.Property;
  
  public class GarbageCollectWriteAheadLogs {
 -  private static final Logger log = Logger.getLogger(GarbageCollectWriteAheadLogs.class);
 +  private static final Logger log = LoggerFactory.getLogger(GarbageCollectWriteAheadLogs.class);
  
 -  private final Instance instance;
 +  private final AccumuloServerContext context;
    private final VolumeManager fs;
    private final Map<HostAndPort,Long> firstSeenDead = new HashMap<HostAndPort,Long>();
-   private AccumuloConfiguration config;
  
    private boolean useTrash;