cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brandonwilli...@apache.org
Subject [3/6] git commit: Backport 6190
Date Wed, 29 Jan 2014 14:58:32 GMT
Backport 6190


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

Branch: refs/heads/trunk
Commit: 35c78d6a942fe54b8039bb15e9037d7707853342
Parents: d43f84b
Author: Brandon Williams <brandonwilliams@apache.org>
Authored: Wed Jan 29 08:56:03 2014 -0600
Committer: Brandon Williams <brandonwilliams@apache.org>
Committed: Wed Jan 29 08:56:03 2014 -0600

----------------------------------------------------------------------
 conf/cassandra-env.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/35c78d6a/conf/cassandra-env.sh
----------------------------------------------------------------------
diff --git a/conf/cassandra-env.sh b/conf/cassandra-env.sh
index dce8ca4..af996ef 100644
--- a/conf/cassandra-env.sh
+++ b/conf/cassandra-env.sh
@@ -203,7 +203,7 @@ JVM_OPTS="$JVM_OPTS -XX:CMSInitiatingOccupancyFraction=75"
 JVM_OPTS="$JVM_OPTS -XX:+UseCMSInitiatingOccupancyOnly"
 JVM_OPTS="$JVM_OPTS -XX:+UseTLAB"
 # note: bash evals '1.7.x' as > '1.7' so this is really a >= 1.7 jvm check
-if [ "$JVM_VERSION" \> "1.7" ] ; then
+if [ "$JVM_VERSION" \> "1.7" ] && [ "$JVM_ARCH" = "64-Bit" ] ; then
     JVM_OPTS="$JVM_OPTS -XX:+UseCondCardMark"
 fi
 


Mime
View raw message