diff --git a/CHANGES.txt b/CHANGES.txt index 4864da1481..978f20a1fa 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -50,6 +50,7 @@ Merged from 2.2: * Fix paging on DISTINCT queries repeats result when first row in partition changes (CASSANDRA-10010) Merged from 2.1: + * Use logback setting for 'cassandra -v' command (CASSANDRA-10767) * Fix sstableloader to unthrottle streaming by default (CASSANDRA-9714) * Fix incorrect warning in 'nodetool status' (CASSANDRA-10176) * Properly release sstable ref when doing offline scrub (CASSANDRA-10697) diff --git a/bin/cassandra b/bin/cassandra index 98de8930ec..d8daa5e898 100755 --- a/bin/cassandra +++ b/bin/cassandra @@ -231,7 +231,7 @@ while true; do exit 0 ;; -v) - "$JAVA" -cp "$CLASSPATH" org.apache.cassandra.tools.GetVersion + "$JAVA" -cp "$CLASSPATH" "-Dlogback.configurationFile=logback-tools.xml" org.apache.cassandra.tools.GetVersion exit 0 ;; -R) diff --git a/bin/cassandra.ps1 b/bin/cassandra.ps1 index 25b701b85c..5d10994eb8 100644 --- a/bin/cassandra.ps1 +++ b/bin/cassandra.ps1 @@ -184,7 +184,7 @@ Function PrintVersion() $pinfo = New-Object System.Diagnostics.ProcessStartInfo $pinfo.FileName = "$env:JAVA_BIN" $pinfo.UseShellExecute = $false - $pinfo.Arguments = "-cp $env:CLASSPATH org.apache.cassandra.tools.GetVersion" + $pinfo.Arguments = "-Dlogback.configurationFile=logback-tools.xml -cp $env:CLASSPATH org.apache.cassandra.tools.GetVersion" $p = New-Object System.Diagnostics.Process $p.StartInfo = $pinfo $p.Start() | Out-Null