cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jmcken...@apache.org
Subject [2/2] cassandra git commit: Merge branch 'cassandra-2.1' into trunk
Date Fri, 08 May 2015 17:33:41 GMT
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 <josh.mckenzie@datastax.com>
Authored: Fri May 8 12:33:25 2015 -0500
Committer: Josh McKenzie <josh.mckenzie@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"
  }


Mime
View raw message