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 AD4A0117CB for ; Thu, 12 Jun 2014 20:06:03 +0000 (UTC) Received: (qmail 4325 invoked by uid 500); 12 Jun 2014 20:06:03 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 4209 invoked by uid 500); 12 Jun 2014 20:06:03 -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 4052 invoked by uid 99); 12 Jun 2014 20:06:03 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 12 Jun 2014 20:06:03 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 24B8A8C3571; Thu, 12 Jun 2014 20:06:03 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jbellis@apache.org To: commits@cassandra.apache.org Date: Thu, 12 Jun 2014 20:06:05 -0000 Message-Id: <0a307925d0f042fabf4c3e795571712b@git.apache.org> In-Reply-To: <611c1cc53213454794eb69eed34da8e8@git.apache.org> References: <611c1cc53213454794eb69eed34da8e8@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/3] 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/bafde3d6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bafde3d6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bafde3d6 Branch: refs/heads/trunk Commit: bafde3d66ca32a414b4e8167060e733abe686a7a Parents: 542e71c b9153f4 Author: Jonathan Ellis Authored: Thu Jun 12 15:05:58 2014 -0500 Committer: Jonathan Ellis Committed: Thu Jun 12 15:05:58 2014 -0500 ---------------------------------------------------------------------- bin/cassandra.bat | 3 +-- bin/cassandra.ps1 | 44 +++++++++++++++++++++++++++++++++++--------- conf/cassandra-env.ps1 | 14 +++++++------- 3 files changed, 43 insertions(+), 18 deletions(-) ----------------------------------------------------------------------