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 E1BB3101AB for ; Fri, 2 May 2014 09:31:21 +0000 (UTC) Received: (qmail 66565 invoked by uid 500); 2 May 2014 09:31:21 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 66294 invoked by uid 500); 2 May 2014 09:31:20 -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 66026 invoked by uid 99); 2 May 2014 09:31:18 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 02 May 2014 09:31:18 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 6347E45065; Fri, 2 May 2014 09:31:18 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: slebresne@apache.org To: commits@cassandra.apache.org Date: Fri, 02 May 2014 09:31:20 -0000 Message-Id: <41ad07222aa841b59263514a96b844f3@git.apache.org> In-Reply-To: <1366480649924ac7815a21122e674a71@git.apache.org> References: <1366480649924ac7815a21122e674a71@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/3] git commit: Merge branch 'cassandra-2.1' into trunk Merge branch 'cassandra-2.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/08d5f26e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/08d5f26e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/08d5f26e Branch: refs/heads/trunk Commit: 08d5f26e3ac89307a7319320b0680c2c94936534 Parents: 73ef82f a811dd0 Author: Sylvain Lebresne Authored: Fri May 2 11:31:05 2014 +0200 Committer: Sylvain Lebresne Committed: Fri May 2 11:31:05 2014 +0200 ---------------------------------------------------------------------- ----------------------------------------------------------------------