Merge branch cassandra-3.11 into cassandra-4.0

zyxep · May 6, 2021 · 42138f1 · 42138f1
2 parents c4fab93 + 4169c43
commit 42138f1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -3,6 +3,7 @@
  * Fix race in fat client removal (CASSANDRA-16238)
  * Test org.apache.cassandra.net.AsyncPromiseTest FAILED (CASSANDRA-16596)
 Merged from 3.11:
+ * Maps $CASSANDRA_LOG_DIR to cassandra.logdir java property when executing nodetool (CASSANDRA-16199)
  * Nodetool garbagecollect should retain SSTableLevel for LCS (CASSANDRA-16634)
  * Ignore stale acks received in the shadow round (CASSANDRA-16588)
 Merged from 3.0:

diff --git a/bin/nodetool b/bin/nodetool
@@ -101,6 +101,7 @@ fi
 CMD=$(echo "$JAVA" $JAVA_AGENT -ea -cp "$CLASSPATH" $JVM_OPTS -Xmx$MAX_HEAP_SIZE \
             -XX:ParallelGCThreads=1 \
             -Dcassandra.storagedir="$cassandra_storagedir" \
+            -Dcassandra.logdir="$CASSANDRA_LOG_DIR" \
             -Dlogback.configurationFile=logback-tools.xml \
             $JVM_ARGS \
             org.apache.cassandra.tools.NodeTool -p $JMX_PORT $ARGS)