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 617E0182A1 for ; Mon, 12 Oct 2015 16:20:28 +0000 (UTC) Received: (qmail 90883 invoked by uid 500); 12 Oct 2015 16:20:25 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 90807 invoked by uid 500); 12 Oct 2015 16:20:25 -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 90392 invoked by uid 99); 12 Oct 2015 16:20:25 -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; Mon, 12 Oct 2015 16:20:25 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 0D034E045B; Mon, 12 Oct 2015 16:20:25 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: benedict@apache.org To: commits@cassandra.apache.org Date: Mon, 12 Oct 2015 16:20:37 -0000 Message-Id: <169a45fc611a4d5b9522ddb1d091f7bc@git.apache.org> In-Reply-To: <8730d6162bc241eb8c7bc9f750240ccd@git.apache.org> References: <8730d6162bc241eb8c7bc9f750240ccd@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [14/19] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2 Merge branch 'cassandra-2.1' into cassandra-2.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0c051a46 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0c051a46 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0c051a46 Branch: refs/heads/trunk Commit: 0c051a46c54fd1a2f151e1a68f4556faca02be8d Parents: 80e6879 4acc3a6 Author: Benedict Elliott Smith Authored: Mon Oct 12 15:13:21 2015 +0100 Committer: Benedict Elliott Smith Committed: Mon Oct 12 15:13:21 2015 +0100 ---------------------------------------------------------------------- ----------------------------------------------------------------------