You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sm...@apache.org on 2024/02/21 08:53:43 UTC
(cassandra) branch trunk updated (1163dd9a08 -> 9cc688e978)
This is an automated email from the ASF dual-hosted git repository.
smiklosovic pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
from 1163dd9a08 Refactor cqlshmain global constants
add 98d0e181d5 Remove bashisms for mx4j tool in cassandra-env.sh
add 6250ba7929 Merge branch 'cassandra-4.0' into cassandra-4.1
add 5ae1294cb1 Merge branch 'cassandra-4.1' into cassandra-5.0
new 9cc688e978 Merge branch 'cassandra-5.0' into trunk
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
CHANGES.txt | 1 +
conf/cassandra-env.sh | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
(cassandra) 01/01: Merge branch 'cassandra-5.0' into trunk
Posted by sm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
smiklosovic pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 9cc688e978826baa8e44a78b3a46cea3a2aa1c5a
Merge: 1163dd9a08 5ae1294cb1
Author: Stefan Miklosovic <sm...@apache.org>
AuthorDate: Wed Feb 21 09:15:27 2024 +0100
Merge branch 'cassandra-5.0' into trunk
CHANGES.txt | 1 +
conf/cassandra-env.sh | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --cc CHANGES.txt
index d2f959ee48,bb93d9d802..1e31dcdc0d
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -37,10 -17,14 +37,11 @@@ Merged from 5.0
* Fix resource cleanup after SAI query timeouts (CASSANDRA-19177)
* Suppress CVE-2023-6481 (CASSANDRA-19184)
Merged from 4.1:
- * Memoize Cassandra verion and add a backoff interval for failed schema pulls (CASSANDRA-18902)
* Fix StackOverflowError on ALTER after many previous schema changes (CASSANDRA-19166)
+ * Memoize Cassandra verion (CASSANDRA-18902)
Merged from 4.0:
+ * Remove bashisms for mx4j tool in cassandra-env.sh (CASSANDRA-19416)
* Add new concurrent_merkle_tree_requests config property to prevent OOM during multi-range and/or multi-table repairs (CASSANDRA-19336)
- * Skip version check if an endpoint is dead state in Gossiper#upgradeFromVersionSupplier (CASSANDRA-19187)
- * Fix Gossiper::hasMajorVersion3Nodes to return false during minor upgrade (CASSANDRA-18999)
- * Revert unnecessary read lock acquisition when reading ring version in TokenMetadata introduced in CASSANDRA-16286 (CASSANDRA-19107)
Merged from 3.11:
Merged from 3.0:
* Backport CASSANDRA-16418 to 3.x (CASSANDRA-18824)
diff --cc conf/cassandra-env.sh
index 0b1dec45ed,ba9f9d4596..4e28e687f9
--- a/conf/cassandra-env.sh
+++ b/conf/cassandra-env.sh
@@@ -271,8 -271,13 +271,8 @@@ JVM_OPTS="$JVM_OPTS -Dcom.sun.managemen
#MX4J_ADDRESS="127.0.0.1"
#MX4J_PORT="8081"
-# Cassandra uses SIGAR to capture OS metrics CASSANDRA-7838
-# for SIGAR we have to set the java.library.path
-# to the location of the native libraries.
-JVM_OPTS="$JVM_OPTS -Djava.library.path=$CASSANDRA_HOME/lib/sigar-bin"
-
if [ "x$MX4J_ADDRESS" != "x" ]; then
- if [[ "$MX4J_ADDRESS" == \-Dmx4jaddress* ]]; then
+ if [ "$(echo "$MX4J_ADDRESS" | grep -c "\-Dmx4jaddress")" = "1" ]; then
# Backward compatible with the older style #13578
JVM_OPTS="$JVM_OPTS $MX4J_ADDRESS"
else
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org