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 1041D9BBC for ; Tue, 13 Mar 2012 16:57:07 +0000 (UTC) Received: (qmail 66844 invoked by uid 500); 13 Mar 2012 16:57:07 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 66689 invoked by uid 500); 13 Mar 2012 16:57:06 -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 66675 invoked by uid 99); 13 Mar 2012 16:57:06 -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, 13 Mar 2012 16:57:06 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 92C6C6D4B; Tue, 13 Mar 2012 16:57:06 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jbellis@apache.org To: commits@cassandra.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [1/6] git commit: Merge branch 'cassandra-1.1' into trunk Message-Id: <20120313165706.92C6C6D4B@tyr.zones.apache.org> Date: Tue, 13 Mar 2012 16:57:06 +0000 (UTC) Updated Branches: refs/heads/cassandra-1.1 b887edf12 -> add6724b3 refs/heads/cassandra-1.1.0 0d68043a7 -> 2d6174cfa refs/heads/trunk f0ab6ac05 -> 79cabc3fa Merge branch 'cassandra-1.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/79cabc3f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/79cabc3f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/79cabc3f Branch: refs/heads/trunk Commit: 79cabc3fa83e0f0085d74a293c3ffb9502e70200 Parents: f0ab6ac add6724 Author: Jonathan Ellis Authored: Tue Mar 13 11:56:55 2012 -0500 Committer: Jonathan Ellis Committed: Tue Mar 13 11:56:55 2012 -0500 ---------------------------------------------------------------------- CHANGES.txt | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/79cabc3f/CHANGES.txt ----------------------------------------------------------------------