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 60B93E212 for ; Tue, 4 Dec 2012 20:56:56 +0000 (UTC) Received: (qmail 4548 invoked by uid 500); 4 Dec 2012 20:56:55 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 4474 invoked by uid 500); 4 Dec 2012 20:56:55 -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 4257 invoked by uid 99); 4 Dec 2012 20:56:55 -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, 04 Dec 2012 20:56:55 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 5487481869A; Tue, 4 Dec 2012 20:56:55 +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: [2/6] git commit: Merge branch 'cassandra-1.2.0' into cassandra-1.2 Message-Id: <20121204205655.5487481869A@tyr.zones.apache.org> Date: Tue, 4 Dec 2012 20:56:55 +0000 (UTC) Merge branch 'cassandra-1.2.0' 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/6bd56cf0 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6bd56cf0 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6bd56cf0 Branch: refs/heads/cassandra-1.2 Commit: 6bd56cf04a0071ecd490b34aa004630b969830ff Parents: d25182f ffb2eba Author: Jonathan Ellis Authored: Tue Dec 4 14:56:39 2012 -0600 Committer: Jonathan Ellis Committed: Tue Dec 4 14:56:39 2012 -0600 ---------------------------------------------------------------------- CHANGES.txt | 35 ++++++++++------------------------- 1 files changed, 10 insertions(+), 25 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/6bd56cf0/CHANGES.txt ----------------------------------------------------------------------