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 C004C181D3 for ; Wed, 18 Nov 2015 13:01:10 +0000 (UTC) Received: (qmail 99806 invoked by uid 500); 18 Nov 2015 13:01:10 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 99750 invoked by uid 500); 18 Nov 2015 13:01:10 -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 99400 invoked by uid 99); 18 Nov 2015 13:01:10 -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, 18 Nov 2015 13:01:10 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 53BB6E0A8D; Wed, 18 Nov 2015 13:01:10 +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: Wed, 18 Nov 2015 13:01:12 -0000 Message-Id: <0746a9bd015b49889c39e6411a29a073@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [3/3] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0 Merge branch 'cassandra-2.2' into cassandra-3.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/12fd5d27 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/12fd5d27 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/12fd5d27 Branch: refs/heads/cassandra-3.0 Commit: 12fd5d270a8de2bcf34b082b410448eba02be4c4 Parents: 2753f95 d09b6c6 Author: Marcus Eriksson Authored: Wed Nov 18 14:00:02 2015 +0100 Committer: Marcus Eriksson Committed: Wed Nov 18 14:00:02 2015 +0100 ---------------------------------------------------------------------- ----------------------------------------------------------------------