Merge branch 'cassandra-2.2' into cassandra-3.0
Conflicts:
conf/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/45eba1ad
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/45eba1ad
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/45eba1ad
Branch: refs/heads/cassandra-3.0
Commit: 45eba1adbb9f2ec84c05b540bd20d044d046cbc6
Parents: b586868 3effec5
Author: Joshua McKenzie <jmcken...@apache.org>
Authored: Tue Sep 1 16:29:39 2015 -0400
Committer: Joshua McKenzie <jmcken...@apache.org>
Committed: Tue Sep 1 16:29:39 2015 -0400
----------------------------------------------------------------------
conf/cassandra-env.ps1 | 4 ----
1 file changed, 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/45eba1ad/conf/cassandra-env.ps1
----------------------------------------------------------------------
diff --cc conf/cassandra-env.ps1
index 67767e7,fc0f6fd..f6bc6a7
--- a/conf/cassandra-env.ps1
+++ b/conf/cassandra-env.ps1
@@@ -347,8 -372,9 +347,6 @@@ Function SetCassandraEnvironmen
# 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"
--
# enable thread priorities, primarily so we can give periodic tasks
# a lower priority to avoid interfering with client workload
$env:JVM_OPTS="$env:JVM_OPTS -XX:+UseThreadPriorities"
