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 D3202174DE for ; Mon, 3 Nov 2014 21:48:03 +0000 (UTC) Received: (qmail 72236 invoked by uid 500); 3 Nov 2014 21:48:03 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 72141 invoked by uid 500); 3 Nov 2014 21:48:03 -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 71767 invoked by uid 99); 3 Nov 2014 21:48:03 -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, 03 Nov 2014 21:48:03 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 1018B99CEE3; Mon, 3 Nov 2014 21:48:03 +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, 03 Nov 2014 21:48:06 -0000 Message-Id: In-Reply-To: <3127dd7100404c709dfc2fb1cbc22a2e@git.apache.org> References: <3127dd7100404c709dfc2fb1cbc22a2e@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [5/6] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1 Merge branch 'cassandra-2.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/25be4649 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/25be4649 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/25be4649 Branch: refs/heads/cassandra-2.1 Commit: 25be46497a8df46f05ffa102bc645bfd684ea48a Parents: 827d93e e88bcfe Author: Brandon Williams Authored: Mon Nov 3 15:47:47 2014 -0600 Committer: Brandon Williams Committed: Mon Nov 3 15:47:47 2014 -0600 ---------------------------------------------------------------------- ----------------------------------------------------------------------