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 E0A9E10FF5 for ; Tue, 17 Feb 2015 16:28:46 +0000 (UTC) Received: (qmail 72852 invoked by uid 500); 17 Feb 2015 16:28:34 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 72737 invoked by uid 500); 17 Feb 2015 16:28:34 -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 72453 invoked by uid 99); 17 Feb 2015 16:28:34 -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; Tue, 17 Feb 2015 16:28:34 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id BCEBFE0833; Tue, 17 Feb 2015 16:28:33 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: snazy@apache.org To: commits@cassandra.apache.org Date: Tue, 17 Feb 2015 16:28:38 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [6/6] cassandra git commit: Merge branch 'cassandra-2.1' into trunk Merge branch 'cassandra-2.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f6879b20 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f6879b20 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f6879b20 Branch: refs/heads/trunk Commit: f6879b205880551729169d4cc506fe2ba7f7ab11 Parents: f9d4044 cd9da44 Author: Robert Stupp Authored: Tue Feb 17 17:27:56 2015 +0100 Committer: Robert Stupp Committed: Tue Feb 17 17:27:56 2015 +0100 ---------------------------------------------------------------------- ----------------------------------------------------------------------