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 5108D11723 for ; Mon, 4 Aug 2014 17:13:29 +0000 (UTC) Received: (qmail 37826 invoked by uid 500); 4 Aug 2014 17:13:28 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 37704 invoked by uid 500); 4 Aug 2014 17:13:28 -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 37445 invoked by uid 99); 4 Aug 2014 17:13:28 -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, 04 Aug 2014 17:13:28 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 08DBC889EAA; Mon, 4 Aug 2014 17:13:28 +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: Mon, 04 Aug 2014 17:13:31 -0000 Message-Id: In-Reply-To: <2e8d44c42ba3410f95cdb8c9ce75b941@git.apache.org> References: <2e8d44c42ba3410f95cdb8c9ce75b941@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [05/10] git commit: Merge branch 'cassandra-1.2' into cassandra-2.1.0 Merge branch 'cassandra-1.2' into cassandra-2.1.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/381dd895 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/381dd895 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/381dd895 Branch: refs/heads/cassandra-2.1 Commit: 381dd895215e4ef0c1d2a863297b019da70571f8 Parents: 4b57695 244f234 Author: Brandon Williams Authored: Mon Aug 4 12:12:57 2014 -0500 Committer: Brandon Williams Committed: Mon Aug 4 12:12:57 2014 -0500 ---------------------------------------------------------------------- ----------------------------------------------------------------------