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 D98BFF411 for ; Mon, 29 Apr 2013 21:55:49 +0000 (UTC) Received: (qmail 43761 invoked by uid 500); 29 Apr 2013 21:55:49 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 43736 invoked by uid 500); 29 Apr 2013 21:55:49 -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 43581 invoked by uid 99); 29 Apr 2013 21:55:49 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 29 Apr 2013 21:55:49 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 098F6883B53; Mon, 29 Apr 2013 21:55:49 +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 Date: Mon, 29 Apr 2013 21:55:50 -0000 Message-Id: <6358bba4db2440faa388b512c4cb8484@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [3/3] 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/011e8a06 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/011e8a06 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/011e8a06 Branch: refs/heads/trunk Commit: 011e8a0602a071c84d1afac4db27a1cc6736d7da Parents: 6a5495a a44a3d4 Author: Jonathan Ellis Authored: Mon Apr 29 16:55:43 2013 -0500 Committer: Jonathan Ellis Committed: Mon Apr 29 16:55:43 2013 -0500 ---------------------------------------------------------------------- CHANGES.txt | 35 ++++++++++++++--------------------- 1 files changed, 14 insertions(+), 21 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/011e8a06/CHANGES.txt ----------------------------------------------------------------------