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 2E50B2009F3 for ; Fri, 6 May 2016 00:05:07 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 2D0A6160A04; Thu, 5 May 2016 22:05:07 +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 6E145160A06 for ; Fri, 6 May 2016 00:05:06 +0200 (CEST) Received: (qmail 91475 invoked by uid 500); 5 May 2016 22:05:04 -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 90946 invoked by uid 99); 5 May 2016 22:05:04 -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; Thu, 05 May 2016 22:05:04 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 2D14AE78B1; Thu, 5 May 2016 22:05:04 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jmckenzie@apache.org To: commits@cassandra.apache.org Date: Thu, 05 May 2016 22:05:11 -0000 Message-Id: <5e8883f07ce14ec69cf931d608818ef4@git.apache.org> In-Reply-To: <2f4e7fe4bbde4a79a4ed32d620ed825b@git.apache.org> References: <2f4e7fe4bbde4a79a4ed32d620ed825b@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [08/10] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.7 archived-at: Thu, 05 May 2016 22:05:07 -0000 Merge branch 'cassandra-3.0' into cassandra-3.7 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/022edf43 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/022edf43 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/022edf43 Branch: refs/heads/cassandra-3.7 Commit: 022edf43601eeb5225b9a64fdff9801fd5929c3e Parents: 58d3b9a b8f2011 Author: Josh McKenzie Authored: Thu May 5 18:04:24 2016 -0400 Committer: Josh McKenzie Committed: Thu May 5 18:04:24 2016 -0400 ---------------------------------------------------------------------- ----------------------------------------------------------------------