Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 840B4200D15 for ; Thu, 5 Oct 2017 17:24:49 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 82875160BDA; Thu, 5 Oct 2017 15:24:49 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id C07C6160BDC for ; Thu, 5 Oct 2017 17:24:48 +0200 (CEST) Received: (qmail 41238 invoked by uid 500); 5 Oct 2017 15:24:46 -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 40932 invoked by uid 99); 5 Oct 2017 15:24:45 -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, 05 Oct 2017 15:24:45 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id C353EF5CAD; Thu, 5 Oct 2017 15:24:42 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: mshuler@apache.org To: commits@cassandra.apache.org Date: Thu, 05 Oct 2017 15:24:55 -0000 Message-Id: <589d05d4fdda44ccade1027333b552ad@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [14/19] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0 archived-at: Thu, 05 Oct 2017 15:24:49 -0000 Merge branch 'cassandra-2.2' into cassandra-3.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c0744125 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c0744125 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c0744125 Branch: refs/heads/trunk Commit: c07441251335b0c305f7c674ead58cd5fb898e7f Parents: e400b97 797de4a Author: Michael Shuler Authored: Thu Oct 5 10:23:15 2017 -0500 Committer: Michael Shuler Committed: Thu Oct 5 10:23:15 2017 -0500 ---------------------------------------------------------------------- ---------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org For additional commands, e-mail: commits-help@cassandra.apache.org