cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jmcken...@apache.org
Subject cassandra git commit: Fix JVM_EXTRA_OPTS in Windows startup scripts
Date Fri, 08 May 2015 17:33:31 GMT
Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.1 ef8dc6715 -> a431d846c


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/cassandra-2.1
Commit: a431d846c191d29d49f98c53675bffcc7956d294
Parents: ef8dc67
Author: Josh McKenzie <josh.mckenzie@datastax.com>
Authored: Fri May 8 12:30:17 2015 -0500
Committer: Josh McKenzie <josh.mckenzie@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"
 }


Mime
View raw message