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 1EC4210760 for ; Tue, 3 Jun 2014 15:35:46 +0000 (UTC) Received: (qmail 98838 invoked by uid 500); 3 Jun 2014 15:35:45 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 98771 invoked by uid 500); 3 Jun 2014 15:35:45 -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 98696 invoked by uid 99); 3 Jun 2014 15:35:45 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 03 Jun 2014 15:35:45 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 5FED0942490; Tue, 3 Jun 2014 15:35:45 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jbellis@apache.org To: commits@cassandra.apache.org Date: Tue, 03 Jun 2014 15:35:49 -0000 Message-Id: <9dd0207e1a8d41a199e66275a2b9aba1@git.apache.org> In-Reply-To: <39c404d29f044b8fb337fc732635d95c@git.apache.org> References: <39c404d29f044b8fb337fc732635d95c@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/9de8d3ef Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9de8d3ef Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9de8d3ef Branch: refs/heads/cassandra-2.1 Commit: 9de8d3ef59637b1001483ce20845e81b7cfeaf97 Parents: f2a656e 2800c7f Author: Jonathan Ellis Authored: Tue Jun 3 10:35:33 2014 -0500 Committer: Jonathan Ellis Committed: Tue Jun 3 10:35:33 2014 -0500 ---------------------------------------------------------------------- ----------------------------------------------------------------------