This is an automated email from the ASF dual-hosted git repository.
mck pushed a commit to branch cassandra-2.2
in repository https://gitbox.apache.org/repos/asf/cassandra.git
The following commit(s) were added to refs/heads/cassandra-2.2 by this push:
new c6a9f55 Remove duplicates from tarball
c6a9f55 is described below
commit c6a9f5513ef19188498f78aeb91260e62a7165e3
Author: mpfau <mp...@users.noreply.github.com>
AuthorDate: Tue Apr 28 17:58:08 2020 +0200
Remove duplicates from tarball
patch by Matthias Pfau; reviewed by Eduard Tudenhöfner, Mick Semb Wever
for CASSANDRA-15768
---
CHANGES.txt | 1 +
build.xml | 1 +
2 files changed, 2 insertions(+)
diff --git a/CHANGES.txt b/CHANGES.txt
index 6913575..00507d2 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.2.18
+ * Remove duplicated tools binaries from tarballs (CASSANDRA-15768)
* Duplicate results with DISTINCT queries in mixed mode (CASSANDRA-15501)
* Disable JMX rebinding (CASSANDRA-15653)
Merged from 2.1:
diff --git a/build.xml b/build.xml
index 6bef406..028210b 100644
--- a/build.xml
+++ b/build.xml
@@ -1128,6 +1128,7 @@
<tarfileset dir="${dist.dir}" prefix="${final.name}">
<include name="**"/>
<exclude name="bin/*" />
+ <exclude name="tools/bin/*"/>
</tarfileset>
<!-- Shell includes in bin/ (default mode) -->
<tarfileset dir="${dist.dir}" prefix="${final.name}">
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
