Merge branch 'cassandra-3.0' into cassandra-3.11

This commit is contained in:
Mick Semb Wever 2020-05-06 12:55:15 +02:00
commit 996c0ada09
No known key found for this signature in database
GPG Key ID: E91335D77E3E87CB
2 changed files with 2 additions and 0 deletions

View File

@ -10,6 +10,7 @@ Merged from 3.0:
* Memtable memory allocations may deadlock (CASSANDRA-15367)
* Run evictFromMembership in GossipStage (CASSANDRA-15592)
Merged from 2.2:
* 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:

View File

@ -1111,6 +1111,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}">