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 76AAA200CED for ; Fri, 18 Aug 2017 19:20:24 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 75716169B03; Fri, 18 Aug 2017 17:20:24 +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 B7F2D169B6A for ; Fri, 18 Aug 2017 19:20:23 +0200 (CEST) Received: (qmail 91202 invoked by uid 500); 18 Aug 2017 17:20:20 -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 90386 invoked by uid 99); 18 Aug 2017 17:20:20 -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, 18 Aug 2017 17:20:20 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 18EE7F5EE6; Fri, 18 Aug 2017 17:20:19 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: marcuse@apache.org To: commits@cassandra.apache.org Date: Fri, 18 Aug 2017 17:20:31 -0000 Message-Id: <0253414fbf1248b8b2ad236c9d9b20db@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [14/15] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11 archived-at: Fri, 18 Aug 2017 17:20:24 -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/01f2855b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/01f2855b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/01f2855b Branch: refs/heads/trunk Commit: 01f2855b478413f3b8593aee86157c46a9bff666 Parents: 76e9e63 8378bfc Author: Marcus Eriksson Authored: Fri Aug 18 19:19:31 2017 +0200 Committer: Marcus Eriksson Committed: Fri Aug 18 19:19:31 2017 +0200 ---------------------------------------------------------------------- ---------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org For additional commands, e-mail: commits-help@cassandra.apache.org