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 8214A9605 for ; Tue, 13 Mar 2012 16:43:26 +0000 (UTC) Received: (qmail 23469 invoked by uid 500); 13 Mar 2012 16:43:26 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 23445 invoked by uid 500); 13 Mar 2012 16:43: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 23336 invoked by uid 99); 13 Mar 2012 16:43:25 -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:43:25 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id AAB406D33; Tue, 13 Mar 2012 16:43:25 +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: [3/6] git commit: Merge branch 'cassandra-1.1.0' into cassandra-1.1 Message-Id: <20120313164325.AAB406D33@tyr.zones.apache.org> Date: Tue, 13 Mar 2012 16:43:25 +0000 (UTC) Merge branch 'cassandra-1.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/b887edf1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b887edf1 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b887edf1 Branch: refs/heads/trunk Commit: b887edf1294f82d61b7dc66326af280e448ebafc Parents: 9f85e10 0d68043 Author: Jonathan Ellis Authored: Tue Mar 13 11:43:05 2012 -0500 Committer: Jonathan Ellis Committed: Tue Mar 13 11:43:05 2012 -0500 ---------------------------------------------------------------------- CHANGES.txt | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b887edf1/CHANGES.txt ----------------------------------------------------------------------