You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ja...@apache.org on 2016/07/01 15:11:04 UTC
cassandra git commit: Revert "Merge branch 'cassandra-2.2' into
cassandra-3.0"
Repository: cassandra
Updated Branches:
refs/heads/cassandra-3.0.8 [created] 8b21d9e9e
Revert "Merge branch 'cassandra-2.2' into cassandra-3.0"
This reverts commit 2395f9e4678c76fa288675c57496259515efef90, reversing
changes made to 70059726f08a98ea21af91ce3855bf62f6f4b652.
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8b21d9e9
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8b21d9e9
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8b21d9e9
Branch: refs/heads/cassandra-3.0.8
Commit: 8b21d9e9e975ea07023ae6ec4c04d997006c1a0a
Parents: 1cff5fa
Author: T Jake Luciani <ja...@apache.org>
Authored: Fri Jul 1 11:09:35 2016 -0400
Committer: T Jake Luciani <ja...@apache.org>
Committed: Fri Jul 1 11:09:35 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/8b21d9e9/conf/cassandra-env.ps1
----------------------------------------------------------------------
diff --git a/conf/cassandra-env.ps1 b/conf/cassandra-env.ps1
index 80645f9..794189f 100644
--- a/conf/cassandra-env.ps1
+++ b/conf/cassandra-env.ps1
@@ -327,7 +327,6 @@ Function SetCassandraEnvironment
# times. If in doubt, and if you do not particularly want to tweak, go
# 100 MB per physical CPU core.
- New-Item -Force -ItemType directory -Path $env:CASSANDRA_HOME/logs/
#GC log path has to be defined here since it needs to find CASSANDRA_HOME
$env:JVM_OPTS="$env:JVM_OPTS -Xloggc:""$env:CASSANDRA_HOME/logs/gc.log"""
http://git-wip-us.apache.org/repos/asf/cassandra/blob/8b21d9e9/conf/cassandra-env.sh
----------------------------------------------------------------------
diff --git a/conf/cassandra-env.sh b/conf/cassandra-env.sh
index 568448b..44fe110 100644
--- a/conf/cassandra-env.sh
+++ b/conf/cassandra-env.sh
@@ -121,7 +121,6 @@ case "$jvm" in
;;
esac
-mkdir -p ${CASSANDRA_HOME}/logs/
#GC log path has to be defined here because it needs to access CASSANDRA_HOME
JVM_OPTS="$JVM_OPTS -Xloggc:${CASSANDRA_HOME}/logs/gc.log"