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 2374A200B57 for ; Wed, 29 Jun 2016 02:17:51 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 224C5160A6F; Wed, 29 Jun 2016 00:17:51 +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 64191160A56 for ; Wed, 29 Jun 2016 02:17:50 +0200 (CEST) Received: (qmail 54808 invoked by uid 500); 29 Jun 2016 00:17:48 -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 54142 invoked by uid 99); 29 Jun 2016 00:17:47 -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, 29 Jun 2016 00:17:47 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 8E140EC22D; Wed, 29 Jun 2016 00:17:47 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jake@apache.org To: commits@cassandra.apache.org Date: Wed, 29 Jun 2016 00:17:53 -0000 Message-Id: <2c352072b2904b33a01292a70b45fc4f@git.apache.org> In-Reply-To: <025a7e4db4a347159ede3a1d2c025df4@git.apache.org> References: <025a7e4db4a347159ede3a1d2c025df4@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [07/22] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2 archived-at: Wed, 29 Jun 2016 00:17:51 -0000 Merge branch 'cassandra-2.1' into cassandra-2.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4da04741 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4da04741 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4da04741 Branch: refs/heads/cassandra-3.9 Commit: 4da04741e990af18eaea3c8ca570051412cb65e8 Parents: 3a61c10 cb14186 Author: T Jake Luciani Authored: Tue Jun 28 20:07:36 2016 -0400 Committer: T Jake Luciani Committed: Tue Jun 28 20:07:36 2016 -0400 ---------------------------------------------------------------------- ----------------------------------------------------------------------