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 472D3116F8 for ; Mon, 19 May 2014 10:33:30 +0000 (UTC) Received: (qmail 5988 invoked by uid 500); 19 May 2014 10:33:30 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 5844 invoked by uid 500); 19 May 2014 10:33:30 -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 5826 invoked by uid 99); 19 May 2014 10:33:30 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 19 May 2014 10:33:30 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id CD3AB986C8F; Mon, 19 May 2014 10:33:29 +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: Mon, 19 May 2014 10:33:31 -0000 Message-Id: In-Reply-To: References: 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/2a6aaca6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2a6aaca6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2a6aaca6 Branch: refs/heads/trunk Commit: 2a6aaca6244fb33024574b14ce89734347696d1d Parents: 5b53013 66a3da0 Author: Sylvain Lebresne Authored: Mon May 19 12:33:21 2014 +0200 Committer: Sylvain Lebresne Committed: Mon May 19 12:33:21 2014 +0200 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ 1 file changed, 2 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2a6aaca6/CHANGES.txt ----------------------------------------------------------------------