You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jm...@apache.org on 2015/05/08 19:33:40 UTC
[1/2] cassandra git commit: Fix JVM_EXTRA_OPTS in Windows startup
scripts
Repository: cassandra
Updated Branches:
refs/heads/trunk 86f481ef9 -> e9d1e7994
Fix JVM_EXTRA_OPTS in Windows startup scripts
Patch by jmckenzie; reviewed by pthompson for CASSANDRA-9335
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a431d846
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a431d846
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a431d846
Branch: refs/heads/trunk
Commit: a431d846c191d29d49f98c53675bffcc7956d294
Parents: ef8dc67
Author: Josh McKenzie <jo...@datastax.com>
Authored: Fri May 8 12:30:17 2015 -0500
Committer: Josh McKenzie <jo...@datastax.com>
Committed: Fri May 8 12:30:17 2015 -0500
----------------------------------------------------------------------
conf/cassandra-env.ps1 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a431d846/conf/cassandra-env.ps1
----------------------------------------------------------------------
diff --git a/conf/cassandra-env.ps1 b/conf/cassandra-env.ps1
index 6d9b8b1..35da856 100644
--- a/conf/cassandra-env.ps1
+++ b/conf/cassandra-env.ps1
@@ -411,7 +411,7 @@ Function SetCassandraEnvironment
#$env:JVM_OPTS="$env:JVM_OPTS -Dcom.sun.management.jmxremote.password.file=C:/jmxremote.password"
$env:JVM_OPTS="$env:JVM_OPTS -Dcassandra.jmx.local.port=$JMX_PORT -XX:+DisableExplicitGC"
- $env:JVM_OPTS="$env:JVM_OPTS $JVM_EXTRA_OPTS"
+ $env:JVM_OPTS="$env:JVM_OPTS $env:JVM_EXTRA_OPTS"
$env:JVM_OPTS = "$env:JVM_OPTS -Dlog4j.configuration=log4j-server.properties"
}
[2/2] cassandra git commit: Merge branch 'cassandra-2.1' into trunk
Posted by jm...@apache.org.
Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e9d1e799
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e9d1e799
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e9d1e799
Branch: refs/heads/trunk
Commit: e9d1e799434cc08f7d4e62da3aff6af89cb6e8d5
Parents: 86f481e a431d84
Author: Josh McKenzie <jo...@datastax.com>
Authored: Fri May 8 12:33:25 2015 -0500
Committer: Josh McKenzie <jo...@datastax.com>
Committed: Fri May 8 12:33:25 2015 -0500
----------------------------------------------------------------------
conf/cassandra-env.ps1 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e9d1e799/conf/cassandra-env.ps1
----------------------------------------------------------------------
diff --cc conf/cassandra-env.ps1
index e0287c5,35da856..dbf83a3
--- a/conf/cassandra-env.ps1
+++ b/conf/cassandra-env.ps1
@@@ -452,9 -411,7 +452,9 @@@ Function SetCassandraEnvironmen
#$env:JVM_OPTS="$env:JVM_OPTS -Dcom.sun.management.jmxremote.password.file=C:/jmxremote.password"
$env:JVM_OPTS="$env:JVM_OPTS -Dcassandra.jmx.local.port=$JMX_PORT -XX:+DisableExplicitGC"
- $env:JVM_OPTS="$env:JVM_OPTS $JVM_EXTRA_OPTS"
+ $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"
}