You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by br...@apache.org on 2014/01/29 15:58:30 UTC
[1/6] git commit: Backport 6190
Updated Branches:
refs/heads/cassandra-1.2 d43f84bb2 -> 35c78d6a9
refs/heads/cassandra-2.0 55211bca7 -> 63059a819
refs/heads/trunk 1a24611ee -> fe967f9a1
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/cassandra-1.2
Commit: 35c78d6a942fe54b8039bb15e9037d7707853342
Parents: d43f84b
Author: Brandon Williams <br...@apache.org>
Authored: Wed Jan 29 08:56:03 2014 -0600
Committer: Brandon Williams <br...@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
[5/6] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Posted by br...@apache.org.
Merge branch 'cassandra-1.2' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/63059a81
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/63059a81
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/63059a81
Branch: refs/heads/cassandra-2.0
Commit: 63059a81944094e4946fdc337ff8951dd2c6ca3e
Parents: 55211bc 35c78d6
Author: Brandon Williams <br...@apache.org>
Authored: Wed Jan 29 08:56:25 2014 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Wed Jan 29 08:56:25 2014 -0600
----------------------------------------------------------------------
----------------------------------------------------------------------
[6/6] git commit: Merge branch 'cassandra-2.0' into trunk
Posted by br...@apache.org.
Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/fe967f9a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fe967f9a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fe967f9a
Branch: refs/heads/trunk
Commit: fe967f9a111a294074d88663dad2b7b228647e0e
Parents: 1a24611 63059a8
Author: Brandon Williams <br...@apache.org>
Authored: Wed Jan 29 08:56:35 2014 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Wed Jan 29 08:56:35 2014 -0600
----------------------------------------------------------------------
----------------------------------------------------------------------
[4/6] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Posted by br...@apache.org.
Merge branch 'cassandra-1.2' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/63059a81
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/63059a81
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/63059a81
Branch: refs/heads/trunk
Commit: 63059a81944094e4946fdc337ff8951dd2c6ca3e
Parents: 55211bc 35c78d6
Author: Brandon Williams <br...@apache.org>
Authored: Wed Jan 29 08:56:25 2014 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Wed Jan 29 08:56:25 2014 -0600
----------------------------------------------------------------------
----------------------------------------------------------------------
[2/6] git commit: Backport 6190
Posted by br...@apache.org.
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/cassandra-2.0
Commit: 35c78d6a942fe54b8039bb15e9037d7707853342
Parents: d43f84b
Author: Brandon Williams <br...@apache.org>
Authored: Wed Jan 29 08:56:03 2014 -0600
Committer: Brandon Williams <br...@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
[3/6] git commit: Backport 6190
Posted by br...@apache.org.
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 <br...@apache.org>
Authored: Wed Jan 29 08:56:03 2014 -0600
Committer: Brandon Williams <br...@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