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 A09241000D for ; Tue, 16 Dec 2014 17:18:19 +0000 (UTC) Received: (qmail 96649 invoked by uid 500); 16 Dec 2014 17:18:19 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 96527 invoked by uid 500); 16 Dec 2014 17:18:19 -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 96509 invoked by uid 99); 16 Dec 2014 17:18:19 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 16 Dec 2014 17:18:19 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 1DE31A2CC76; Tue, 16 Dec 2014 17:18:19 +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: Tue, 16 Dec 2014 17:18:20 -0000 Message-Id: <7fb3a28f67854fddb76b0068181c878b@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [2/2] cassandra git commit: Merge branch 'cassandra-2.1' into trunk Merge branch 'cassandra-2.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/847fef83 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/847fef83 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/847fef83 Branch: refs/heads/trunk Commit: 847fef833670c9853546f97ce6930165245c5c85 Parents: d0e3f45 d66ae75 Author: Joshua McKenzie Authored: Tue Dec 16 11:17:04 2014 -0600 Committer: Joshua McKenzie Committed: Tue Dec 16 11:17:04 2014 -0600 ---------------------------------------------------------------------- conf/cassandra-env.ps1 | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/847fef83/conf/cassandra-env.ps1 ----------------------------------------------------------------------