This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch cassandra-3.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git
The following commit(s) were added to refs/heads/cassandra-3.0 by this push: new 75ddf76 Ensure java executable is on the path. 75ddf76 is described below commit 75ddf76801a7b603f9da5fcee0dc72bacc5843c6 Author: Angelo Polo <polo.langu...@gmail.com> AuthorDate: Fri Jul 16 07:54:35 2021 -0500 Ensure java executable is on the path. Patch by Angelo Polo; reviewed by Aleksei Zotov, brandonwilliams and edimitrova for CASSANDRA-14325 --- CHANGES.txt | 1 + bin/cassandra | 2 +- bin/debug-cql | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt index be040fc..37a516c 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 3.0.25: + * Ensure java executable is on the path (CASSANDRA-14325) * Make speculative retry parameter case-insensitive for backward compatibility with 2.1 (CASSANDRA-16467) * Push digest mismatch exceptions to trace (CASSANDRA-14900) * Support long names in nodetool output (CASSANDRA-14162) diff --git a/bin/cassandra b/bin/cassandra index f887b31..d7cfbd7 100755 --- a/bin/cassandra +++ b/bin/cassandra @@ -98,7 +98,7 @@ if [ -n "$JAVA_HOME" ]; then fi done else - JAVA=java + JAVA=`command -v java 2> /dev/null` fi if [ -z $JAVA ] ; then diff --git a/bin/debug-cql b/bin/debug-cql index 00d4093..b4991fd 100755 --- a/bin/debug-cql +++ b/bin/debug-cql @@ -36,7 +36,7 @@ fi if [ -n "$JAVA_HOME" ]; then JAVA="$JAVA_HOME/bin/java" else - JAVA=java + JAVA=`command -v java 2> /dev/null` fi if [ -z "$CASSANDRA_CONF" -o -z "$CLASSPATH" ]; then --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org