Return-Path: X-Original-To: apmail-cassandra-commits-archive@www.apache.org Delivered-To: apmail-cassandra-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 2046318D8E for ; Fri, 29 Jan 2016 07:18:06 +0000 (UTC) Received: (qmail 78590 invoked by uid 500); 29 Jan 2016 07:17:58 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 78520 invoked by uid 500); 29 Jan 2016 07:17:58 -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 78146 invoked by uid 99); 29 Jan 2016 07:17:58 -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; Fri, 29 Jan 2016 07:17:58 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id E9526E112B; Fri, 29 Jan 2016 07:17:57 +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: Fri, 29 Jan 2016 07:18:10 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [14/15] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.3 Merge branch 'cassandra-3.0' into cassandra-3.3 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/573552c8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/573552c8 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/573552c8 Branch: refs/heads/trunk Commit: 573552c80cd76661cfe31a5855817aaa7b483089 Parents: 1a31958 682812d Author: Marcus Eriksson Authored: Fri Jan 29 08:14:08 2016 +0100 Committer: Marcus Eriksson Committed: Fri Jan 29 08:14:08 2016 +0100 ---------------------------------------------------------------------- ----------------------------------------------------------------------