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 D07B4200B5C for ; Wed, 27 Jul 2016 17:42:55 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id CF72C160A93; Wed, 27 Jul 2016 15:42:55 +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 2C35C160AA9 for ; Wed, 27 Jul 2016 17:42:55 +0200 (CEST) Received: (qmail 65122 invoked by uid 500); 27 Jul 2016 15:42:54 -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 64800 invoked by uid 99); 27 Jul 2016 15:42:54 -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, 27 Jul 2016 15:42:54 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id DCFF8E04BE; Wed, 27 Jul 2016 15:42:53 +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: Wed, 27 Jul 2016 15:42:56 -0000 Message-Id: In-Reply-To: <97612ce9c22e45c18e88a6044d23bc20@git.apache.org> References: <97612ce9c22e45c18e88a6044d23bc20@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: Wed, 27 Jul 2016 15:42:56 -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/04a0c00f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/04a0c00f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/04a0c00f Branch: refs/heads/trunk Commit: 04a0c00ff30f86a7455401410748c8c31fb8bc9a Parents: 247a56b 01d5fa8 Author: Josh McKenzie Authored: Wed Jul 27 11:42:18 2016 -0400 Committer: Josh McKenzie Committed: Wed Jul 27 11:42:18 2016 -0400 ---------------------------------------------------------------------- ----------------------------------------------------------------------