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 3D0AD10604 for ; Tue, 30 Apr 2013 04:55:35 +0000 (UTC) Received: (qmail 37548 invoked by uid 500); 30 Apr 2013 04:55:33 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 37370 invoked by uid 500); 30 Apr 2013 04:55:33 -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 37337 invoked by uid 99); 30 Apr 2013 04:55:33 -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, 30 Apr 2013 04:55:33 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id EB5CA883F61; Tue, 30 Apr 2013 04:55:32 +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: Tue, 30 Apr 2013 04:55:33 -0000 Message-Id: <40cf9bb0c21a44b5947e108a9b538ec5@git.apache.org> In-Reply-To: <2db7adb7ef974da892117a28d3300f6b@git.apache.org> References: <2db7adb7ef974da892117a28d3300f6b@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] git commit: Merge branch 'cassandra-1.1' into cassandra-1.2 Merge branch 'cassandra-1.1' into cassandra-1.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4f5c8474 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4f5c8474 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4f5c8474 Branch: refs/heads/cassandra-1.2 Commit: 4f5c84742aae68bcd2b6e864c54a15ddba0bddf8 Parents: a44a3d4 50f49a6 Author: Dave Brosius Authored: Tue Apr 30 00:55:10 2013 -0400 Committer: Dave Brosius Committed: Tue Apr 30 00:55:10 2013 -0400 ---------------------------------------------------------------------- build.xml | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4f5c8474/build.xml ----------------------------------------------------------------------