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 E4EA4200BC7 for ; Thu, 10 Nov 2016 15:53:09 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id E329F160B10; Thu, 10 Nov 2016 14:53:09 +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 30EA1160AF6 for ; Thu, 10 Nov 2016 15:53:09 +0100 (CET) Received: (qmail 91982 invoked by uid 500); 10 Nov 2016 14:53:07 -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 91279 invoked by uid 99); 10 Nov 2016 14:53:07 -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, 10 Nov 2016 14:53:07 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 7CB21ED30E; Thu, 10 Nov 2016 14:53:07 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: marcuse@apache.org To: commits@cassandra.apache.org Date: Thu, 10 Nov 2016 14:53:11 -0000 Message-Id: <193a3549d23949a290f466245da4ccab@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [5/6] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.X archived-at: Thu, 10 Nov 2016 14:53:10 -0000 Merge branch 'cassandra-3.0' into cassandra-3.X Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a07d7ac4 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a07d7ac4 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a07d7ac4 Branch: refs/heads/cassandra-3.X Commit: a07d7ac4839982392f140868c67c560e887dc1ec Parents: 90eed50 9d90b4e Author: Marcus Eriksson Authored: Thu Nov 10 15:47:02 2016 +0100 Committer: Marcus Eriksson Committed: Thu Nov 10 15:47:02 2016 +0100 ---------------------------------------------------------------------- ----------------------------------------------------------------------