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/08/27 17:12:13 UTC
[1/3] git commit: Add ability to detect unofficial openjdk builds.
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.0 29befa180 -> 0e272c233
refs/heads/cassandra-2.1 ec0975304 -> cb62ef401
Add ability to detect unofficial openjdk builds.
Patch by brandonwilliams, reviewed by enigmacurry for CASSANDRA-7799
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0e272c23
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0e272c23
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0e272c23
Branch: refs/heads/cassandra-2.0
Commit: 0e272c233d050961fe79b94f333668b900d4fbbe
Parents: 29befa1
Author: Brandon Williams <br...@apache.org>
Authored: Wed Aug 27 10:08:18 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Wed Aug 27 10:08:18 2014 -0500
----------------------------------------------------------------------
conf/cassandra-env.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0e272c23/conf/cassandra-env.sh
----------------------------------------------------------------------
diff --git a/conf/cassandra-env.sh b/conf/cassandra-env.sh
index c4c8bd5..3544426 100644
--- a/conf/cassandra-env.sh
+++ b/conf/cassandra-env.sh
@@ -90,7 +90,7 @@ calculate_heap_sizes()
java_ver_output=`"${JAVA:-java}" -version 2>&1`
-jvmver=`echo "$java_ver_output" | grep 'java version' | awk -F'"' 'NR==1 {print $2}'`
+jvmver=`echo "$java_ver_output" | grep '[openjdk|java] version' | awk -F'"' 'NR==1 {print $2}'`
JVM_VERSION=${jvmver%_*}
JVM_PATCH_VERSION=${jvmver#*_}
[3/3] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Posted by br...@apache.org.
Merge branch 'cassandra-2.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cb62ef40
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cb62ef40
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cb62ef40
Branch: refs/heads/cassandra-2.1
Commit: cb62ef401972d4674b5d810019bd3575b95f9e8d
Parents: ec09753 0e272c2
Author: Brandon Williams <br...@apache.org>
Authored: Wed Aug 27 10:11:20 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Wed Aug 27 10:11:20 2014 -0500
----------------------------------------------------------------------
conf/cassandra-env.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/cb62ef40/conf/cassandra-env.sh
----------------------------------------------------------------------
[2/3] git commit: Add ability to detect unofficial openjdk builds.
Posted by br...@apache.org.
Add ability to detect unofficial openjdk builds.
Patch by brandonwilliams, reviewed by enigmacurry for CASSANDRA-7799
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0e272c23
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0e272c23
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0e272c23
Branch: refs/heads/cassandra-2.1
Commit: 0e272c233d050961fe79b94f333668b900d4fbbe
Parents: 29befa1
Author: Brandon Williams <br...@apache.org>
Authored: Wed Aug 27 10:08:18 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Wed Aug 27 10:08:18 2014 -0500
----------------------------------------------------------------------
conf/cassandra-env.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0e272c23/conf/cassandra-env.sh
----------------------------------------------------------------------
diff --git a/conf/cassandra-env.sh b/conf/cassandra-env.sh
index c4c8bd5..3544426 100644
--- a/conf/cassandra-env.sh
+++ b/conf/cassandra-env.sh
@@ -90,7 +90,7 @@ calculate_heap_sizes()
java_ver_output=`"${JAVA:-java}" -version 2>&1`
-jvmver=`echo "$java_ver_output" | grep 'java version' | awk -F'"' 'NR==1 {print $2}'`
+jvmver=`echo "$java_ver_output" | grep '[openjdk|java] version' | awk -F'"' 'NR==1 {print $2}'`
JVM_VERSION=${jvmver%_*}
JVM_PATCH_VERSION=${jvmver#*_}