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 EEC01200C53 for ; Tue, 11 Apr 2017 19:55:06 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id ED620160B9B; Tue, 11 Apr 2017 17:55:06 +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 3AA85160B9E for ; Tue, 11 Apr 2017 19:55:06 +0200 (CEST) Received: (qmail 419 invoked by uid 500); 11 Apr 2017 17:55:05 -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 201 invoked by uid 99); 11 Apr 2017 17:55:05 -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, 11 Apr 2017 17:55:05 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 018ADDFF0F; Tue, 11 Apr 2017 17:55:05 +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: Tue, 11 Apr 2017 17:55:07 -0000 Message-Id: In-Reply-To: <03d10ef27b4b43438d021c77bef363c0@git.apache.org> References: <03d10ef27b4b43438d021c77bef363c0@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [4/6] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11 archived-at: Tue, 11 Apr 2017 17:55:07 -0000 Merge branch 'cassandra-3.0' into cassandra-3.11 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/fe8e2110 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fe8e2110 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fe8e2110 Branch: refs/heads/trunk Commit: fe8e21109371c5d768204da4076d168c8b2fc01a Parents: c975142 91661ec Author: Michael Shuler Authored: Tue Apr 11 12:54:15 2017 -0500 Committer: Michael Shuler Committed: Tue Apr 11 12:54:15 2017 -0500 ---------------------------------------------------------------------- ----------------------------------------------------------------------