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 03D33FBCF for ; Thu, 2 May 2013 14:25:14 +0000 (UTC) Received: (qmail 6840 invoked by uid 500); 2 May 2013 14:25:12 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 6803 invoked by uid 500); 2 May 2013 14:25:12 -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 6742 invoked by uid 99); 2 May 2013 14:25:12 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 02 May 2013 14:25:12 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 3B137885F5A; Thu, 2 May 2013 14:25:12 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: dbrosius@apache.org To: commits@cassandra.apache.org Date: Thu, 02 May 2013 14:25:17 -0000 Message-Id: <30a99492651d429e83923cedbd8410aa@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [7/7] git commit: Merge branch 'cassandra-1.2' into trunk Merge branch 'cassandra-1.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/bcd80487 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bcd80487 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bcd80487 Branch: refs/heads/trunk Commit: bcd80487a4c4af3b5e76a6720b5032ae2d622a22 Parents: e2506f1 2ef11b4 Author: Dave Brosius Authored: Thu May 2 10:24:19 2013 -0400 Committer: Dave Brosius Committed: Thu May 2 10:24:19 2013 -0400 ---------------------------------------------------------------------- build.xml | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/bcd80487/build.xml ----------------------------------------------------------------------