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 <[email protected]> Authored: Wed Feb 17 10:27:01 2016 -0600 Committer: Yuki Morishita <[email protected]> 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
