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 E7C3E200C4F for ; Fri, 17 Mar 2017 23:43:14 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id E4F68160B8C; Fri, 17 Mar 2017 22:43:14 +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 68285160B70 for ; Fri, 17 Mar 2017 23:43:14 +0100 (CET) Received: (qmail 35924 invoked by uid 500); 17 Mar 2017 22:43:12 -0000 Mailing-List: contact commits-help@cassandra.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cassandra.apache.org Delivered-To: mailing list commits@cassandra.apache.org Received: (qmail 35547 invoked by uid 99); 17 Mar 2017 22:43:12 -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, 17 Mar 2017 22:43:12 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 9BE93E001D; Fri, 17 Mar 2017 22:43:12 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jjirsa@apache.org To: commits@cassandra.apache.org Date: Fri, 17 Mar 2017 22:43:17 -0000 Message-Id: <6a227a01b0b34faaa3ac53418bf461f0@git.apache.org> In-Reply-To: <7b028852395d487585cfad41fccd382d@git.apache.org> References: <7b028852395d487585cfad41fccd382d@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [6/6] cassandra git commit: Merge branch 'cassandra-3.11' into trunk archived-at: Fri, 17 Mar 2017 22:43:15 -0000 Merge branch 'cassandra-3.11' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5ec97afc Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5ec97afc Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5ec97afc Branch: refs/heads/trunk Commit: 5ec97afce9de71eaf9b63bf6ac406aee344d860c Parents: 9d93365 1092f5e Author: Jeff Jirsa Authored: Fri Mar 17 15:28:33 2017 -0700 Committer: Jeff Jirsa Committed: Fri Mar 17 15:29:36 2017 -0700 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../cassandra/metrics/DroppedMessageMetrics.java | 6 +++++- .../org/apache/cassandra/net/MessagingService.java | 17 ++++++++++++++++- .../apache/cassandra/net/MessagingServiceTest.java | 3 +++ 4 files changed, 25 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5ec97afc/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5ec97afc/src/java/org/apache/cassandra/net/MessagingService.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5ec97afc/test/unit/org/apache/cassandra/net/MessagingServiceTest.java ----------------------------------------------------------------------