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 340B9189E0 for ; Wed, 17 Feb 2016 16:27:19 +0000 (UTC) Received: (qmail 43856 invoked by uid 500); 17 Feb 2016 16:27:18 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 43814 invoked by uid 500); 17 Feb 2016 16:27:17 -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 43562 invoked by uid 99); 17 Feb 2016 16:27:17 -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; Wed, 17 Feb 2016 16:27:17 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id A3199E35D6; Wed, 17 Feb 2016 16:27:17 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: yukim@apache.org To: commits@cassandra.apache.org Date: Wed, 17 Feb 2016 16:27:26 -0000 Message-Id: <76172e42c7a84427915b5fd47fad0d6b@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [10/10] cassandra git commit: Merge branch 'cassandra-3.0' into trunk Merge branch 'cassandra-3.0' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7871c36e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7871c36e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7871c36e Branch: refs/heads/trunk Commit: 7871c36e36522b3c9b62d689b94b52b416f886e5 Parents: 9f322ac 39e966d Author: Yuki Morishita Authored: Wed Feb 17 10:27:01 2016 -0600 Committer: Yuki Morishita Committed: Wed Feb 17 10:27:01 2016 -0600 ---------------------------------------------------------------------- CHANGES.txt | 1 + bin/cassandra | 2 +- bin/cassandra.ps1 | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/7871c36e/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/7871c36e/bin/cassandra ---------------------------------------------------------------------- diff --cc bin/cassandra index 98de893,c968c35..d8daa5e --- a/bin/cassandra +++ b/bin/cassandra @@@ -231,13 -231,9 +231,13 @@@ while true; d exit 0 ;; -v) - "$JAVA" -cp "$CLASSPATH" org.apache.cassandra.tools.GetVersion + "$JAVA" -cp "$CLASSPATH" "-Dlogback.configurationFile=logback-tools.xml" org.apache.cassandra.tools.GetVersion exit 0 ;; + -R) + allow_root="yes" + shift + ;; -D) properties="$properties -D$2" shift 2