You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by mc...@apache.org on 2020/01/29 22:35:12 UTC
[cassandra] branch trunk updated (609bac6 -> 729146a)
This is an automated email from the ASF dual-hosted git repository.
mck pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git.
from 609bac6 Merge branch 'cassandra-3.11' into trunk
new 531dc2a ninja-fixes: `ant publish` needs to have built the artifacts, and update the cassandra_logdir_fix debian patch after CASSANDRA-14306
new 7816301 Merge branch 'cassandra-2.2' into cassandra-3.0
new 37ce461 Merge branch 'cassandra-3.0' into cassandra-3.11
new 729146a Merge branch 'cassandra-3.11' into trunk
The 4 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:
build.xml | 5 +++--
debian/patches/cassandra_logdir_fix.diff | 32 ++++++++++----------------------
2 files changed, 13 insertions(+), 24 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-3.11' into trunk
Posted by mc...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mck pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 729146a074712ba63cebdebe443170656dadf56c
Merge: 609bac6 37ce461
Author: Mick Semb Wever <mc...@apache.org>
AuthorDate: Wed Jan 29 23:34:21 2020 +0100
Merge branch 'cassandra-3.11' into trunk
build.xml | 5 +++--
debian/patches/cassandra_logdir_fix.diff | 32 ++++++++++----------------------
2 files changed, 13 insertions(+), 24 deletions(-)
diff --cc build.xml
index cad8ca4,4e3e41f..7997231
--- a/build.xml
+++ b/build.xml
@@@ -2265,8 -2129,10 +2265,9 @@@
classifier="javadoc"/>
</target>
+ <!-- Publish artifacts to remote Maven repository -->
<target name="publish"
- depends="mvn-install"
+ depends="mvn-install,artifacts"
- if="release"
description="Publishes the artifacts to the Maven repository">
<!-- the parent -->
diff --cc debian/patches/cassandra_logdir_fix.diff
index 8597331,0000000..a13dec0
mode 100644,000000..100644
--- a/debian/patches/cassandra_logdir_fix.diff
+++ b/debian/patches/cassandra_logdir_fix.diff
@@@ -1,34 -1,0 +1,22 @@@
+--- a/bin/cassandra
++++ b/bin/cassandra
+@@ -109,7 +109,7 @@
+ fi
-
++
+ if [ -z "$CASSANDRA_LOG_DIR" ]; then
+- CASSANDRA_LOG_DIR=$CASSANDRA_HOME/logs
++ CASSANDRA_LOG_DIR=/var/log/cassandra
+ fi
-
++
+ # Special-case path variables.
+--- a/conf/cassandra-env.sh
++++ b/conf/cassandra-env.sh
- @@ -93,16 +93,16 @@
- echo "$JVM_OPTS" | grep -q "^-[X]log:gc"
- if [ "$?" = "1" ] ; then # [X] to prevent ccm from replacing this line
- # only add -Xlog:gc if it's not mentioned in jvm-server.options file
- - mkdir -p ${CASSANDRA_HOME}/logs
- - JVM_OPTS="$JVM_OPTS -Xlog:gc=info,heap*=trace,age*=debug,safepoint=info,promotion*=trace:file=${CASSANDRA_HOME}/logs/gc.log:time,uptime,pid,tid,level:filecount=10,filesize=10485760"
- + mkdir -p /var/log/cassandra
- + JVM_OPTS="$JVM_OPTS -Xlog:gc=info,heap*=trace,age*=debug,safepoint=info,promotion*=trace:file=/var/log/cassandra/gc.log:time,uptime,pid,tid,level:filecount=10,filesize=10485760"
- fi
- else
- # Java 8
- echo "$JVM_OPTS" | grep -q "^-[X]loggc"
- if [ "$?" = "1" ] ; then # [X] to prevent ccm from replacing this line
- # only add -Xlog:gc if it's not mentioned in jvm-server.options file
- - mkdir -p ${CASSANDRA_HOME}/logs
- - JVM_OPTS="$JVM_OPTS -Xloggc:${CASSANDRA_HOME}/logs/gc.log"
- + mkdir -p /var/log/cassandra
- + JVM_OPTS="$JVM_OPTS -Xloggc:/var/log/cassandra/gc.log"
- fi
++@@ -88,7 +88,7 @@ calculate_heap_sizes()
++
++ # Sets the path where logback and GC logs are written.
++ if [ "x$CASSANDRA_LOG_DIR" = "x" ] ; then
++- CASSANDRA_LOG_DIR="$CASSANDRA_HOME/logs"
+++ CASSANDRA_LOG_DIR=/var/log/cassandra
+ fi
-
++
++ #GC log path has to be defined here because it needs to access CASSANDRA_HOME
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org