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 0BEEA200B45 for ; Thu, 30 Jun 2016 22:50:35 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 0ABDC160A73; Thu, 30 Jun 2016 20:50:35 +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 80DB3160A06 for ; Thu, 30 Jun 2016 22:50:34 +0200 (CEST) Received: (qmail 73770 invoked by uid 500); 30 Jun 2016 20:50:33 -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 73230 invoked by uid 99); 30 Jun 2016 20:50:33 -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, 30 Jun 2016 20:50:33 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 139B7E9646; Thu, 30 Jun 2016 20:50:33 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jmckenzie@apache.org To: commits@cassandra.apache.org Date: Thu, 30 Jun 2016 20:50:46 -0000 Message-Id: <2e183ff1a10e45849ac09006108a9419@git.apache.org> In-Reply-To: <3b10c3edf05941639651b50895699d7c@git.apache.org> References: <3b10c3edf05941639651b50895699d7c@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [15/17] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.9 archived-at: Thu, 30 Jun 2016 20:50:35 -0000 Merge branch 'cassandra-3.0' into cassandra-3.9 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c86b3e18 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c86b3e18 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c86b3e18 Branch: refs/heads/cassandra-3.9 Commit: c86b3e183015a1656b35306e5adc1647132a07c9 Parents: 1d9d566 6b24109 Author: Josh McKenzie Authored: Thu Jun 30 16:33:53 2016 -0400 Committer: Josh McKenzie Committed: Thu Jun 30 16:33:53 2016 -0400 ---------------------------------------------------------------------- conf/cassandra-env.ps1 | 1 - conf/cassandra-env.sh | 1 - 2 files changed, 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c86b3e18/conf/cassandra-env.ps1 ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c86b3e18/conf/cassandra-env.sh ----------------------------------------------------------------------