From c6a9f5513ef19188498f78aeb91260e62a7165e3 Mon Sep 17 00:00:00 2001
From: mpfau <mpfau@users.noreply.github.com>
Date: Tue, 28 Apr 2020 17:58:08 +0200
Subject: [PATCH] Remove duplicates from tarball
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

 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 69135756b6..00507d2008 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 6bef406c74..028210bf6c 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}">