Repository: cassandra Updated Branches: refs/heads/trunk 17f8788ef -> 0d2603cf9
ninja: remove vestigial log4j from cassandra-env.ps1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3effec53 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3effec53 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3effec53 Branch: refs/heads/trunk Commit: 3effec53e3d99e886266cf508ae00db1c869b29e Parents: 0a4ce44 Author: Joshua McKenzie <jmcken...@apache.org> Authored: Tue Sep 1 16:29:03 2015 -0400 Committer: Joshua McKenzie <jmcken...@apache.org> Committed: Tue Sep 1 16:29:03 2015 -0400 ---------------------------------------------------------------------- conf/cassandra-env.ps1 | 4 ---- 1 file changed, 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/3effec53/conf/cassandra-env.ps1 ---------------------------------------------------------------------- diff --git a/conf/cassandra-env.ps1 b/conf/cassandra-env.ps1 index f6cd6bc..fc0f6fd 100644 --- a/conf/cassandra-env.ps1 +++ b/conf/cassandra-env.ps1 @@ -372,8 +372,6 @@ Function SetCassandraEnvironment # store in env to check if it's avail in verification $env:JMX_PORT=$JMX_PORT - $env:JVM_OPTS = "$env:JVM_OPTS -Dlog4j.defaultInitOverride=true" - # some JVMs will fill up their heap when accessed via JMX, see CASSANDRA-6541 $env:JVM_OPTS="$env:JVM_OPTS -XX:+CMSClassUnloadingEnabled" @@ -471,7 +469,5 @@ Function SetCassandraEnvironment $env:JVM_OPTS="$env:JVM_OPTS $env:JVM_EXTRA_OPTS" - $env:JVM_OPTS = "$env:JVM_OPTS -Dlog4j.configuration=log4j-server.properties" - #$env:JVM_OPTS="$env:JVM_OPTS -XX:+UnlockCommercialFeatures -XX:+FlightRecorder" }