natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cassandra-3.11' into trunk

This commit is contained in:
Mick Semb Wever 2018-05-10 12:46:27 +10:00
parent 87e886789a df9475086d
commit 4268761695
No known key found for this signature in database
GPG Key ID: E91335D77E3E87CB
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -238,6 +238,7 @@
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)

2
conf/cassandra-env.sh
View File

@ -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