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 2658B189A6 for ; Fri, 14 Aug 2015 15:45:20 +0000 (UTC) Received: (qmail 31777 invoked by uid 500); 14 Aug 2015 15:45:19 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 31671 invoked by uid 500); 14 Aug 2015 15:45:19 -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 31561 invoked by uid 99); 14 Aug 2015 15:45:19 -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; Fri, 14 Aug 2015 15:45:19 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 694C1E04E4; Fri, 14 Aug 2015 15:45:19 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: tylerhobbs@apache.org To: commits@cassandra.apache.org Date: Fri, 14 Aug 2015 15:45:20 -0000 Message-Id: <98a348d7b9524d7e981ccf53a90fae71@git.apache.org> In-Reply-To: <75c3a3c354ba482da895d848b08c95c5@git.apache.org> References: <75c3a3c354ba482da895d848b08c95c5@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/5] 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/972ae147 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/972ae147 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/972ae147 Branch: refs/heads/cassandra-2.2 Commit: 972ae147247a0e4c2bba3a3c2853c2209e93cd95 Parents: 012b987 50e5802 Author: Jonathan Ellis Authored: Tue Aug 11 16:32:47 2015 -0500 Committer: Jonathan Ellis Committed: Tue Aug 11 16:32:47 2015 -0500 ---------------------------------------------------------------------- ----------------------------------------------------------------------