cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brandonwilli...@apache.org
Subject [1/3] git commit: Modernize 4366 unrevert
Date Sat, 09 Feb 2013 00:02:41 GMT
Modernize 4366 unrevert


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6bef66bc
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6bef66bc
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6bef66bc

Branch: refs/heads/cassandra-1.2
Commit: 6bef66bce837f81063b5551a6952504bfd9db576
Parents: 7347d96
Author: Brandon Williams <brandonwilliams@apache.org>
Authored: Fri Feb 8 18:02:39 2013 -0600
Committer: Brandon Williams <brandonwilliams@apache.org>
Committed: Fri Feb 8 18:02:39 2013 -0600

----------------------------------------------------------------------
 conf/cassandra-env.sh |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/6bef66bc/conf/cassandra-env.sh
----------------------------------------------------------------------
diff --git a/conf/cassandra-env.sh b/conf/cassandra-env.sh
index daae043..527dba0 100644
--- a/conf/cassandra-env.sh
+++ b/conf/cassandra-env.sh
@@ -202,8 +202,7 @@ JVM_OPTS="$JVM_OPTS -XX:SurvivorRatio=8"
 JVM_OPTS="$JVM_OPTS -XX:MaxTenuringThreshold=1"
 JVM_OPTS="$JVM_OPTS -XX:CMSInitiatingOccupancyFraction=75"
 JVM_OPTS="$JVM_OPTS -XX:+UseCMSInitiatingOccupancyOnly"
-if [ "$java_version" = "1.7" ]
-then
+if [ "$JVM_VERSION" \> "1.6.0" ]; then
     JVM_OPTS="$JVM_OPTS -XX:+UseCondCardMark"
 fi
 


Mime
View raw message