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 DC8C7200BEC for ; Thu, 24 Nov 2016 00:40:02 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id DB005160AFD; Wed, 23 Nov 2016 23:40:02 +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 34243160B1F for ; Thu, 24 Nov 2016 00:40:02 +0100 (CET) Received: (qmail 77359 invoked by uid 500); 23 Nov 2016 23:40:01 -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 77186 invoked by uid 99); 23 Nov 2016 23:40:00 -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; Wed, 23 Nov 2016 23:40:00 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id D970DEEE7B; Wed, 23 Nov 2016 23:40:00 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: dbrosius@apache.org To: commits@cassandra.apache.org Date: Wed, 23 Nov 2016 23:40:03 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [4/4] cassandra git commit: Merge branch 'cassandra-3.X' into trunk archived-at: Wed, 23 Nov 2016 23:40:03 -0000 Merge branch 'cassandra-3.X' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/df84bdf5 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/df84bdf5 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/df84bdf5 Branch: refs/heads/trunk Commit: df84bdf5c3fad20170b21b2a3c7d4507daef93c4 Parents: ac2a0a5 6854191 Author: Dave Brosius Authored: Wed Nov 23 18:39:43 2016 -0500 Committer: Dave Brosius Committed: Wed Nov 23 18:39:43 2016 -0500 ---------------------------------------------------------------------- src/java/org/apache/cassandra/repair/messages/SyncRequest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ----------------------------------------------------------------------