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 2737B11D22 for ; Fri, 2 May 2014 21:44:06 +0000 (UTC) Received: (qmail 31194 invoked by uid 500); 2 May 2014 21:43:59 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 30984 invoked by uid 500); 2 May 2014 21:43:56 -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 30825 invoked by uid 99); 2 May 2014 21:43:54 -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, 02 May 2014 21:43:54 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 3423682A6C0; Fri, 2 May 2014 21:43:54 +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, 02 May 2014 21:43:59 -0000 Message-Id: In-Reply-To: <2b9d0950264f46cf92b200a0bff479dc@git.apache.org> References: <2b9d0950264f46cf92b200a0bff479dc@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [07/10] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0 Merge branch 'cassandra-1.2' into cassandra-2.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2658c90e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2658c90e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2658c90e Branch: refs/heads/trunk Commit: 2658c90e67bd5e933dde18c8404662fd99b9e105 Parents: 238a020 837bded Author: Brandon Williams Authored: Fri May 2 16:39:45 2014 -0500 Committer: Brandon Williams Committed: Fri May 2 16:39:45 2014 -0500 ---------------------------------------------------------------------- ----------------------------------------------------------------------