Return-Path: 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 61668200B7D for ; Fri, 26 Aug 2016 19:25:11 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 60144160A94; Fri, 26 Aug 2016 17:25:11 +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 AE261160AB6 for ; Fri, 26 Aug 2016 19:25:10 +0200 (CEST) Received: (qmail 89721 invoked by uid 500); 26 Aug 2016 17:25:09 -0000 Mailing-List: contact commits-help@accumulo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@accumulo.apache.org Delivered-To: mailing list commits@accumulo.apache.org Received: (qmail 89697 invoked by uid 99); 26 Aug 2016 17:25:09 -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; Fri, 26 Aug 2016 17:25:09 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id B682DE69A3; Fri, 26 Aug 2016 17:25:09 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: elserj@apache.org To: commits@accumulo.apache.org Date: Fri, 26 Aug 2016 17:25:13 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [5/6] accumulo git commit: Merge branch '1.7' into 1.8 archived-at: Fri, 26 Aug 2016 17:25:11 -0000 Merge branch '1.7' into 1.8 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/d7c50d1f Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d7c50d1f Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/d7c50d1f Branch: refs/heads/1.8 Commit: d7c50d1fd16334c6c42d90c3241c1751b2d9529e Parents: def8f90 40d5a72 Author: Josh Elser Authored: Fri Aug 26 13:24:39 2016 -0400 Committer: Josh Elser Committed: Fri Aug 26 13:24:39 2016 -0400 ---------------------------------------------------------------------- .../java/org/apache/accumulo/master/replication/WorkMaker.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/d7c50d1f/server/master/src/main/java/org/apache/accumulo/master/replication/WorkMaker.java ---------------------------------------------------------------------- diff --cc server/master/src/main/java/org/apache/accumulo/master/replication/WorkMaker.java index 6c5645d,e8c3ca7..bd9bd65 --- a/server/master/src/main/java/org/apache/accumulo/master/replication/WorkMaker.java +++ b/server/master/src/main/java/org/apache/accumulo/master/replication/WorkMaker.java @@@ -93,8 -93,8 +93,8 @@@ public class WorkMaker for (Entry entry : s) { // Extract the useful bits from the status key ReplicationSchema.StatusSection.getFile(entry.getKey(), file); - ReplicationSchema.StatusSection.getTableId(entry.getKey(), tableId); + String tableId = ReplicationSchema.StatusSection.getTableId(entry.getKey()); - log.info("Processing replication status record for " + file + " on table " + tableId); + log.debug("Processing replication status record for " + file + " on table " + tableId); Status status; try {