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 7DA1D18845 for ; Wed, 2 Dec 2015 14:10:47 +0000 (UTC) Received: (qmail 28588 invoked by uid 500); 2 Dec 2015 14:10:47 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 28516 invoked by uid 500); 2 Dec 2015 14:10:47 -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 28386 invoked by uid 99); 2 Dec 2015 14:10:47 -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 Dec 2015 14:10:47 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 131AAE60CE; Wed, 2 Dec 2015 14:10:47 +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, 02 Dec 2015 14:10:48 -0000 Message-Id: <51a5b678b2cf4f25a512e49d06d32af2@git.apache.org> In-Reply-To: <5e90b5ad78b64a4babb737496f9697ea@git.apache.org> References: <5e90b5ad78b64a4babb737496f9697ea@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/4] 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/bb6973a6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bb6973a6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bb6973a6 Branch: refs/heads/cassandra-3.1 Commit: bb6973a6fe132249031a281788f232c975e3456f Parents: b950c38 882df8a Author: Marcus Eriksson Authored: Wed Dec 2 15:09:09 2015 +0100 Committer: Marcus Eriksson Committed: Wed Dec 2 15:09:09 2015 +0100 ---------------------------------------------------------------------- ----------------------------------------------------------------------