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 1850D9EDF for ; Tue, 1 May 2012 18:59:27 +0000 (UTC) Received: (qmail 91358 invoked by uid 500); 1 May 2012 18:59:26 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 91320 invoked by uid 500); 1 May 2012 18:59:26 -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 91224 invoked by uid 99); 1 May 2012 18:59:26 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 01 May 2012 18:59:26 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 4C8A213409; Tue, 1 May 2012 18:59:26 +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 X-Mailer: ASF-Git Admin Mailer Subject: [3/6] git commit: Merge branch 'cassandra-1.0' into cassandra-1.1 Message-Id: <20120501185926.4C8A213409@tyr.zones.apache.org> Date: Tue, 1 May 2012 18:59:26 +0000 (UTC) Merge branch 'cassandra-1.0' into cassandra-1.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/52bd2732 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/52bd2732 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/52bd2732 Branch: refs/heads/trunk Commit: 52bd2732cd3228f473b7ebdb9f9959db5e0e73f8 Parents: 0529feb f4430ff Author: Brandon Williams Authored: Tue May 1 13:59:12 2012 -0500 Committer: Brandon Williams Committed: Tue May 1 13:59:12 2012 -0500 ---------------------------------------------------------------------- build.xml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/52bd2732/build.xml ----------------------------------------------------------------------