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 2014/08/13 20:57:25 UTC
[1/2] git commit: Add new CMS GC flags on Windows launch scripts for
JVM > 7u60
Repository: cassandra
Updated Branches:
refs/heads/trunk 5d6d89199 -> 9b4c4ef65
Add new CMS GC flags on Windows launch scripts for JVM > 7u60
Patch by Josh McKenzie, reviewed by jbellis for CASSANDRA-7714
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e00bb4a2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e00bb4a2
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e00bb4a2
Branch: refs/heads/trunk
Commit: e00bb4a2a03a00b528e6d4c7c324f1fe9e9e3d83
Parents: aab4711
Author: Joshua McKenzie <jo...@datastax.com>
Authored: Wed Aug 13 13:50:37 2014 -0500
Committer: Joshua McKenzie <jo...@datastax.com>
Committed: Wed Aug 13 13:50:37 2014 -0500
----------------------------------------------------------------------
conf/cassandra-env.ps1 | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e00bb4a2/conf/cassandra-env.ps1
----------------------------------------------------------------------
diff --git a/conf/cassandra-env.ps1 b/conf/cassandra-env.ps1
index f6505de..168f322 100644
--- a/conf/cassandra-env.ps1
+++ b/conf/cassandra-env.ps1
@@ -274,6 +274,11 @@ Function SetCassandraEnvironment
{
$env:JVM_OPTS="$env:JVM_OPTS -XX:+UseCondCardMark"
}
+ if ( (($env:JVM_VERSION.CompareTo("1.7") -ge 0) -and ($env:JVM_PATCH_VERSION.CompareTo("60") -ge 0)) -or
+ ($env:JVM_VERSION.CompareTo("1.8") -ge 0))
+ {
+ $env:JVM_OPTS="$env:JVM_OPTS -XX:+CMSParallelInitialMarkEnabled -XX:+CMSEdenChunksRecordAlways"
+ }
# GC logging options -- uncomment to enable
# $env:JVM_OPTS="$env:JVM_OPTS -XX:+PrintGCDetails"
[2/2] 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/9b4c4ef6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9b4c4ef6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9b4c4ef6
Branch: refs/heads/trunk
Commit: 9b4c4ef654fd58cc1cda3f7919a0e27cd1723dbc
Parents: 5d6d891 e00bb4a
Author: Joshua McKenzie <jo...@datastax.com>
Authored: Wed Aug 13 13:55:53 2014 -0500
Committer: Joshua McKenzie <jo...@datastax.com>
Committed: Wed Aug 13 13:55:53 2014 -0500
----------------------------------------------------------------------
conf/cassandra-env.ps1 | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------