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 80ED5D3D1 for ; Fri, 7 Dec 2012 22:56:15 +0000 (UTC) Received: (qmail 49200 invoked by uid 500); 7 Dec 2012 22:56:13 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 49104 invoked by uid 500); 7 Dec 2012 22:56:13 -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 48799 invoked by uid 99); 7 Dec 2012 22:56:13 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 07 Dec 2012 22:56:13 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 24B3D31D838; Fri, 7 Dec 2012 22:56:13 +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: [6/16] git commit: merge from 1.1 Message-Id: <20121207225613.24B3D31D838@tyr.zones.apache.org> Date: Fri, 7 Dec 2012 22:56:13 +0000 (UTC) merge from 1.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d599b3fc Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d599b3fc Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d599b3fc Branch: refs/heads/cassandra-1.2.0 Commit: d599b3fc80292620043191cbe5a280630207f78e Parents: 8f7754d f618369 Author: Jonathan Ellis Authored: Fri Dec 7 16:55:48 2012 -0600 Committer: Jonathan Ellis Committed: Fri Dec 7 16:55:48 2012 -0600 ---------------------------------------------------------------------- CHANGES.txt | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d599b3fc/CHANGES.txt ----------------------------------------------------------------------