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 B1060176FD for ; Thu, 18 Jun 2015 18:50:32 +0000 (UTC) Received: (qmail 53933 invoked by uid 500); 18 Jun 2015 18:50:32 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 53870 invoked by uid 500); 18 Jun 2015 18:50:32 -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 53641 invoked by uid 99); 18 Jun 2015 18:50:32 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 18 Jun 2015 18:50:32 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 319D2E3CA9; Thu, 18 Jun 2015 18:50:32 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jake@apache.org To: commits@cassandra.apache.org Date: Thu, 18 Jun 2015 18:50:33 -0000 Message-Id: In-Reply-To: <9cb145d70419469e8feabd9d336f4720@git.apache.org> References: <9cb145d70419469e8feabd9d336f4720@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/6] cassandra 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/83c0e01a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/83c0e01a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/83c0e01a Branch: refs/heads/trunk Commit: 83c0e01aa84a6cbfe36a89ef13027a78567df70a Parents: 0452e74 23e66a9 Author: T Jake Luciani Authored: Thu Jun 18 14:32:10 2015 -0400 Committer: T Jake Luciani Committed: Thu Jun 18 14:32:10 2015 -0400 ---------------------------------------------------------------------- ----------------------------------------------------------------------