Repository: cassandra Updated Branches: refs/heads/cassandra-3.11 72fb86d5a -> df9475086 refs/heads/trunk 87e886789 -> 426876169
Detect OpenJDK jvm type and architecture Patch by Stefan Podkowinski; Reviewed by Mick Semb Wever for CASSANDRA-12793 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/df947508 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/df947508 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/df947508 Branch: refs/heads/cassandra-3.11 Commit: df9475086de4c52bd050d7c31088950778dbb672 Parents: 72fb86d Author: Mick Semb Wever <[email protected]> Authored: Wed May 9 10:12:41 2018 +1000 Committer: Mick Semb Wever <[email protected]> Committed: Thu May 10 12:46:03 2018 +1000 ---------------------------------------------------------------------- CHANGES.txt | 1 + conf/cassandra-env.sh | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/df947508/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index d8d3d6f..2b7530f 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 3.11.3 + * Detect OpenJDK jvm type and architecture (CASSANDRA-12793) * Don't use guava collections in the non-system keyspace jmx attributes (CASSANDRA-12271) * Allow existing nodes to use all peers in shadow round (CASSANDRA-13851) * Fix cqlsh to read connection.ssl cqlshrc option again (CASSANDRA-14299) http://git-wip-us.apache.org/repos/asf/cassandra/blob/df947508/conf/cassandra-env.sh ---------------------------------------------------------------------- diff --git a/conf/cassandra-env.sh b/conf/cassandra-env.sh index 189576b..8932985 100644 --- a/conf/cassandra-env.sh +++ b/conf/cassandra-env.sh @@ -102,7 +102,7 @@ if [ "$JVM_VERSION" \< "1.8" ] && [ "$JVM_PATCH_VERSION" -lt 40 ] ; then exit 1; fi -jvm=`echo "$java_ver_output" | grep -A 1 'java version' | awk 'NR==2 {print $1}'` +jvm=`echo "$java_ver_output" | grep -A 1 '[openjdk|java] version' | awk 'NR==2 {print $1}'` case "$jvm" in OpenJDK) JVM_VENDOR=OpenJDK --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
