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 93353200D42 for ; Thu, 12 Oct 2017 19:11:22 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 91D5D1609E4; Thu, 12 Oct 2017 17:11:22 +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 CA1DB160BE4 for ; Thu, 12 Oct 2017 19:11:21 +0200 (CEST) Received: (qmail 77360 invoked by uid 500); 12 Oct 2017 17:11:21 -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 77260 invoked by uid 99); 12 Oct 2017 17:11:20 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 12 Oct 2017 17:11:20 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 4651C84FA4; Thu, 12 Oct 2017 17:11:17 +0000 (UTC) Date: Thu, 12 Oct 2017 17:11:20 +0000 To: "commits@accumulo.apache.org" Subject: [accumulo] 01/01: Merge branch '1.8' MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit From: elserj@apache.org In-Reply-To: <150782827684.16790.977944135958818395@gitbox.apache.org> References: <150782827684.16790.977944135958818395@gitbox.apache.org> X-Git-Host: gitbox.apache.org X-Git-Repo: accumulo X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Rev: f9a551504ecb92e6baf4f6b9f741eb8a584b6f8f X-Git-NotificationType: diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated Message-Id: <20171012171118.4651C84FA4@gitbox.apache.org> archived-at: Thu, 12 Oct 2017 17:11:22 -0000 This is an automated email from the ASF dual-hosted git repository. elserj pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/accumulo.git commit f9a551504ecb92e6baf4f6b9f741eb8a584b6f8f Merge: 23f7d6e 0af1dba Author: Josh Elser AuthorDate: Thu Oct 12 12:30:03 2017 -0400 Merge branch '1.8' .../server/replication/ReplicationUtil.java | 30 ++++++ .../master/metrics/Metrics2ReplicationMetrics.java | 92 ++++++++++++++--- .../metrics/Metrics2ReplicationMetricsTest.java | 109 +++++++++++++++++++++ 3 files changed, 217 insertions(+), 14 deletions(-) -- To stop receiving notification emails like this one, please contact "commits@accumulo.apache.org" .