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 4AE74200B49 for ; Tue, 19 Jul 2016 19:58:06 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 49BD7160A5C; Tue, 19 Jul 2016 17:58:06 +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 90B93160A8C for ; Tue, 19 Jul 2016 19:58:05 +0200 (CEST) Received: (qmail 18783 invoked by uid 500); 19 Jul 2016 17:58: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 18421 invoked by uid 99); 19 Jul 2016 17:58: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; Tue, 19 Jul 2016 17:58:04 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 16193E0A7D; Tue, 19 Jul 2016 17:58:04 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: samt@apache.org To: commits@cassandra.apache.org Date: Tue, 19 Jul 2016 17:58:07 -0000 Message-Id: <95efc05c616a4684b760e8d3a0b058eb@git.apache.org> In-Reply-To: <06f378fbddd946b4a652e7f2a9f3684c@git.apache.org> References: <06f378fbddd946b4a652e7f2a9f3684c@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [4/6] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.9 archived-at: Tue, 19 Jul 2016 17:58:06 -0000 Merge branch 'cassandra-3.0' into cassandra-3.9 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4bd4be86 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4bd4be86 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4bd4be86 Branch: refs/heads/trunk Commit: 4bd4be867ebeecfd7bd0a67ebeb122923d5ff850 Parents: 9ed4877 0297cbe Author: Sam Tunnicliffe Authored: Tue Jul 19 18:52:15 2016 +0100 Committer: Sam Tunnicliffe Committed: Tue Jul 19 18:52:15 2016 +0100 ---------------------------------------------------------------------- ----------------------------------------------------------------------