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:08 UTC
[cassandra] branch cassandra-3.0 updated (f1d07ac -> 7816301)
This is an automated email from the ASF dual-hosted git repository.
mck pushed a change to branch cassandra-3.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git.
from f1d07ac Merge branch 'cassandra-2.2' into cassandra-3.0
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
The 2 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/002cassandra_logdir_fix.dpatch | 18 +++++++++---------
2 files changed, 12 insertions(+), 11 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-2.2' into cassandra-3.0
Posted by mc...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mck pushed a commit to branch cassandra-3.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 7816301ef277d69e0b4942af32df25899f61147b
Merge: f1d07ac 531dc2a
Author: Mick Semb Wever <mc...@apache.org>
AuthorDate: Wed Jan 29 23:07:57 2020 +0100
Merge branch 'cassandra-2.2' into cassandra-3.0
build.xml | 5 +++--
debian/patches/002cassandra_logdir_fix.dpatch | 18 +++++++++---------
2 files changed, 12 insertions(+), 11 deletions(-)
diff --cc build.xml
index 98c22a5,97c2f35..5556a8f
--- a/build.xml
+++ b/build.xml
@@@ -2041,9 -2040,9 +2041,9 @@@
<arg value="${build.src.java}" />
</java>
</target>
-
+
- <!-- Publish artifacts to Maven repositories -->
+ <!-- Installs artifacts to local Maven repository -->
<target name="mvn-install"
depends="maven-declare-dependencies,jar,sources-jar,javadoc-jar"
description="Installs the artifacts in the Maven Local Repository">
@@@ -2084,11 -2083,12 +2084,12 @@@
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 -->
<deploy pomFile="${build.dir}/${final.name}-parent.pom"
file="${build.dir}/${final.name}-parent.pom"
diff --cc debian/patches/002cassandra_logdir_fix.dpatch
index 5e76b91,cca337c..2a3a47d
mode 100755,100644..100755
--- a/debian/patches/002cassandra_logdir_fix.dpatch
+++ b/debian/patches/002cassandra_logdir_fix.dpatch
@@@ -6,26 -6,26 +6,26 @@@
@DPATCH@
diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' cassandra~/bin/cassandra cassandra/bin/cassandra
---- cassandra~/bin/cassandra 2015-10-27 14:15:10.718076265 -0500
-+++ cassandra/bin/cassandra 2015-10-27 14:23:10.000000000 -0500
-@@ -139,7 +139,7 @@
- props="$3"
- class="$4"
- cassandra_parms="-Dlogback.configurationFile=logback.xml"
-- cassandra_parms="$cassandra_parms -Dcassandra.logdir=$CASSANDRA_HOME/logs"
-+ cassandra_parms="$cassandra_parms -Dcassandra.logdir=/var/log/cassandra"
- cassandra_parms="$cassandra_parms -Dcassandra.storagedir=$cassandra_storagedir"
+--- cassandra~/bin/cassandra 2019-06-27 09:35:32.000000000 -0500
++++ cassandra/bin/cassandra 2019-06-27 09:43:28.756343141 -0500
+@@ -127,7 +127,7 @@
+ fi
- if [ "x$pidpath" != "x" ]; then
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' cassandra~/conf/cassandra-env.sh cassandra/conf/cassandra-env.sh
---- cassandra~/conf/cassandra-env.sh 2015-10-27 14:20:22.990840135 -0500
-+++ cassandra/conf/cassandra-env.sh 2015-10-27 14:24:03.210202234 -0500
-@@ -288,7 +288,7 @@
- JVM_OPTS="$JVM_OPTS -XX:+PrintPromotionFailure"
- #JVM_OPTS="$JVM_OPTS -XX:PrintFLSStatistics=1"
+ if [ -z "$CASSANDRA_LOG_DIR" ]; then
+- CASSANDRA_LOG_DIR=$CASSANDRA_HOME/logs
++ CASSANDRA_LOG_DIR=/var/log/cassandra
+ fi
--JVM_OPTS="$JVM_OPTS -Xloggc:${CASSANDRA_HOME}/logs/gc.log"
-+JVM_OPTS="$JVM_OPTS -Xloggc:/var/log/cassandra/gc.log"
- JVM_OPTS="$JVM_OPTS -XX:+UseGCLogFileRotation"
- JVM_OPTS="$JVM_OPTS -XX:NumberOfGCLogFiles=10"
- JVM_OPTS="$JVM_OPTS -XX:GCLogFileSize=10M"
+ # Special-case path variables.
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' cassandra~/conf/cassandra-env.sh cassandra/conf/cassandra-env.sh
+--- cassandra~/conf/cassandra-env.sh 2019-06-27 09:35:32.000000000 -0500
++++ cassandra/conf/cassandra-env.sh 2019-06-27 09:42:25.747715490 -0500
- @@ -122,7 +122,7 @@
- esac
-
- #GC log path has to be defined here because it needs to access CASSANDRA_HOME
- -JVM_OPTS="$JVM_OPTS -Xloggc:${CASSANDRA_HOME}/logs/gc.log"
- +JVM_OPTS="$JVM_OPTS -Xloggc:/var/log/cassandra/gc.log"
-
- # Here we create the arguments that will get passed to the jvm when
- # starting cassandra.
++@@ -123,7 +123,7 @@ esac
++
++ # 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