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 D1C8618D65 for ; Tue, 9 Jun 2015 07:26:00 +0000 (UTC) Received: (qmail 22395 invoked by uid 500); 9 Jun 2015 07:25:59 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 22344 invoked by uid 500); 9 Jun 2015 07:25:59 -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 21966 invoked by uid 99); 9 Jun 2015 07:25: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; Tue, 09 Jun 2015 07:25:58 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id C6ACFE0281; Tue, 9 Jun 2015 07:25:58 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: samt@apache.org To: commits@cassandra.apache.org Date: Tue, 09 Jun 2015 07:26:07 -0000 Message-Id: <5dd92ce0b0a3404ab666ade373b79704@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [10/10] cassandra git commit: Merge branch 'cassandra-2.2' into trunk Merge branch 'cassandra-2.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e182217b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e182217b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e182217b Branch: refs/heads/trunk Commit: e182217b204b0acdd08cf1d23b0f1ffa8101baec Parents: 446e253 2e791af Author: Sam Tunnicliffe Authored: Tue Jun 9 08:16:54 2015 +0100 Committer: Sam Tunnicliffe Committed: Tue Jun 9 08:16:54 2015 +0100 ---------------------------------------------------------------------- ----------------------------------------------------------------------