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 9693C1780B for ; Wed, 29 Oct 2014 19:02:05 +0000 (UTC) Received: (qmail 30156 invoked by uid 500); 29 Oct 2014 19:02:05 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 30083 invoked by uid 500); 29 Oct 2014 19:02:05 -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 29800 invoked by uid 99); 29 Oct 2014 19:02: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; Wed, 29 Oct 2014 19:02:05 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id C15D7884BCD; Wed, 29 Oct 2014 19:02:04 +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: Wed, 29 Oct 2014 19:02:08 -0000 Message-Id: In-Reply-To: <7f9b200f7f5a48b09002894eb858437d@git.apache.org> References: <7f9b200f7f5a48b09002894eb858437d@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/6f1b7496 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6f1b7496 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6f1b7496 Branch: refs/heads/cassandra-2.1 Commit: 6f1b74963b6297881a83d1cbbfa81efde465f7f0 Parents: fee7137 f13ce55 Author: Brandon Williams Authored: Wed Oct 29 14:01:45 2014 -0500 Committer: Brandon Williams Committed: Wed Oct 29 14:01:45 2014 -0500 ---------------------------------------------------------------------- ----------------------------------------------------------------------