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 682C9104F2 for ; Fri, 4 Oct 2013 03:20:11 +0000 (UTC) Received: (qmail 35001 invoked by uid 500); 4 Oct 2013 03:20:09 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 34909 invoked by uid 500); 4 Oct 2013 03:20:08 -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 34495 invoked by uid 99); 4 Oct 2013 03:20:05 -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, 04 Oct 2013 03:20:05 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 5CF3490F3BE; Fri, 4 Oct 2013 03:20:04 +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: Fri, 04 Oct 2013 03:20:08 -0000 Message-Id: <77a26ae2abce4b2dad041f86542e924d@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [6/6] git commit: Merge branch 'cassandra-2.0' into trunk Merge branch 'cassandra-2.0' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6dda6f2d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6dda6f2d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6dda6f2d Branch: refs/heads/trunk Commit: 6dda6f2d8a0975a38f5c321805f0695928b77791 Parents: 53ac6b2 213f6bb Author: Jonathan Ellis Authored: Thu Oct 3 22:19:41 2013 -0500 Committer: Jonathan Ellis Committed: Thu Oct 3 22:19:41 2013 -0500 ---------------------------------------------------------------------- ----------------------------------------------------------------------