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 4FBF719100 for ; Thu, 14 Apr 2016 10:33:35 +0000 (UTC) Received: (qmail 71609 invoked by uid 500); 14 Apr 2016 10:33:35 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 71447 invoked by uid 500); 14 Apr 2016 10:33:35 -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 71342 invoked by uid 99); 14 Apr 2016 10:33:35 -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, 14 Apr 2016 10:33:35 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id D0F88E027F; Thu, 14 Apr 2016 10:33:34 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: blerer@apache.org To: commits@cassandra.apache.org Date: Thu, 14 Apr 2016 10:33:35 -0000 Message-Id: In-Reply-To: <5e811abaf0544c86a0a512fb11999723@git.apache.org> References: <5e811abaf0544c86a0a512fb11999723@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] 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/0818e1b1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0818e1b1 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0818e1b1 Branch: refs/heads/cassandra-3.0 Commit: 0818e1b16af36adb2fbbd3dffacdccc2ecf60a9a Parents: fd24b7c 69edeaa Author: Benjamin Lerer Authored: Thu Apr 14 12:32:56 2016 +0200 Committer: Benjamin Lerer Committed: Thu Apr 14 12:33:05 2016 +0200 ---------------------------------------------------------------------- ----------------------------------------------------------------------