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 9751511A5F for ; Thu, 15 May 2014 04:07:42 +0000 (UTC) Received: (qmail 20700 invoked by uid 500); 14 May 2014 18:27:56 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 20489 invoked by uid 500); 14 May 2014 18:27:56 -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 20322 invoked by uid 99); 14 May 2014 18:27:56 -0000 Received: from Unknown (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 14 May 2014 18:27:56 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 06FE28C4D8F; Wed, 14 May 2014 18:27:56 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: brandonwilliams@apache.org To: commits@cassandra.apache.org Date: Wed, 14 May 2014 18:28:00 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [6/6] 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/1cfa5610 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1cfa5610 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1cfa5610 Branch: refs/heads/trunk Commit: 1cfa56100cafbf9119d7a3bc6a9be27c6c4d98db Parents: 30aec93 a680f72 Author: Brandon Williams Authored: Wed May 14 13:27:49 2014 -0500 Committer: Brandon Williams Committed: Wed May 14 13:27:49 2014 -0500 ---------------------------------------------------------------------- build.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1cfa5610/build.xml ----------------------------------------------------------------------