natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cassandra-3.11' into trunk

This commit is contained in:
Andrés de la Peña 2020-10-21 13:24:18 +01:00
parent 2edc5bb441 a2f59be943
commit 095540d54a
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -34,6 +34,7 @@ Merged from 3.0:
* Handle unexpected columns due to schema races (CASSANDRA-15899)
* Add flag to ignore unreplicated keyspaces during repair (CASSANDRA-15160)
Merged from 2.2:
* Package tools/bin scripts as executable (CASSANDRA-16151)
* Fixed a NullPointerException when calling nodetool enablethrift (CASSANDRA-16127)
* Automatically drop compact storage on tables for which it is safe (CASSANDRA-16048)

14
build.xml
View File

@ -1271,14 +1271,14 @@
<!-- Shell includes in bin/ (default mode) -->
<tarfileset dir="${dist.dir}" prefix="${final.name}">
<include name="bin/*.in.sh" />
<include name="tools/bin/*.in.sh" />
</tarfileset>
<!-- Executable scripts in bin/ -->
<tarfileset dir="${dist.dir}" prefix="${final.name}" mode="755">
<include name="bin/*"/>
<include name="tools/bin/*"/>
<not>
<filename name="bin/*.in.sh" />
</not>
<exclude name="bin/*.in.sh" />
<exclude name="tools/bin/*.in.sh" />
</tarfileset>
</tar>
@ -1296,6 +1296,7 @@
<exclude name="conf/hotspot_compiler" />
<exclude name="doc/cql3/CQL.html" />
<exclude name="bin/*" /> <!-- handled separately below -->
<exclude name="tools/bin/*" /> <!-- handled separately below -->
<!-- exclude Eclipse files -->
<exclude name=".project" />
<exclude name=".classpath" />
@ -1303,16 +1304,21 @@
<exclude name=".externalToolBuilders/**" />
</tarfileset>
<!-- Shell includes and batch files in bin/ -->
<!-- Shell includes and batch files in bin/ and tools/bin/ -->
<tarfileset dir="${basedir}" prefix="${final.name}-src">
<include name="bin/*.in.sh" />
<include name="bin/*.bat" />
<include name="tools/bin/*.in.sh" />
<include name="tools/bin/*.bat" />
</tarfileset>
<!-- Everything else (assumed to be scripts), is executable -->
<tarfileset dir="${basedir}" prefix="${final.name}-src" mode="755">
<include name="bin/*"/>
<exclude name="bin/*.in.sh" />
<exclude name="bin/*.bat" />
<include name="tools/bin/*"/>
<exclude name="tools/bin/*.in.sh" />
<exclude name="tools/bin/*.bat" />
</tarfileset>
</tar>