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 E0A4110AC9 for ; Fri, 10 Jan 2014 19:07:10 +0000 (UTC) Received: (qmail 27410 invoked by uid 500); 10 Jan 2014 19:07:03 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 27360 invoked by uid 500); 10 Jan 2014 19:07:00 -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 27250 invoked by uid 99); 10 Jan 2014 19:06:56 -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, 10 Jan 2014 19:06:56 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 49F7E32A60D; Fri, 10 Jan 2014 19:06:56 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: brandonwilliams@apache.org To: commits@cassandra.apache.org Date: Fri, 10 Jan 2014 19:07:01 -0000 Message-Id: <41c51cc1873d472c99446d0dbdbbe872@git.apache.org> In-Reply-To: <658042534f714c55875e0d450e89f607@git.apache.org> References: <658042534f714c55875e0d450e89f607@git.apache.org> 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/ebc712ae Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ebc712ae Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ebc712ae Branch: refs/heads/trunk Commit: ebc712aeb9f8730c5b5a73eba6261f566d79956e Parents: b5e2a01 87c6ec1 Author: Brandon Williams Authored: Fri Jan 10 13:05:01 2014 -0600 Committer: Brandon Williams Committed: Fri Jan 10 13:05:01 2014 -0600 ---------------------------------------------------------------------- ----------------------------------------------------------------------