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 3FFC318C9F for ; Wed, 2 Mar 2016 21:04:05 +0000 (UTC) Received: (qmail 55253 invoked by uid 500); 2 Mar 2016 21:04:03 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 55175 invoked by uid 500); 2 Mar 2016 21:04:03 -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 54769 invoked by uid 99); 2 Mar 2016 21:04:03 -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, 02 Mar 2016 21:04:03 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 04994E178F; Wed, 2 Mar 2016 21:04:03 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jasobrown@apache.org To: commits@cassandra.apache.org Date: Wed, 02 Mar 2016 21:04:08 -0000 Message-Id: <5ebaa2362b604171b0b25504bd4c469f@git.apache.org> In-Reply-To: <0c869171677b4aecaa9234cccab253ad@git.apache.org> References: <0c869171677b4aecaa9234cccab253ad@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [07/16] 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/49a33e49 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/49a33e49 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/49a33e49 Branch: refs/heads/cassandra-3.5 Commit: 49a33e49c362f1ebdbf214320842a6f3a5ac16b0 Parents: 3c8a097 0934542 Author: Jason Brown Authored: Wed Mar 2 12:58:16 2016 -0800 Committer: Jason Brown Committed: Wed Mar 2 12:58:16 2016 -0800 ---------------------------------------------------------------------- ----------------------------------------------------------------------