cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alek...@apache.org
Subject [1/4] git commit: Add ability to detect unofficial openjdk builds.
Date Wed, 27 Aug 2014 15:21:12 GMT
Repository: cassandra
Updated Branches:
  refs/heads/trunk 2a6e0714a -> 0d0aed85f


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/trunk
Commit: 0e272c233d050961fe79b94f333668b900d4fbbe
Parents: 29befa1
Author: Brandon Williams <brandonwilliams@apache.org>
Authored: Wed Aug 27 10:08:18 2014 -0500
Committer: Brandon Williams <brandonwilliams@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#*_}
 


Mime
View raw message