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

Merge branch 'cassandra-2.2' into cassandra-3.0 

# Conflicts:
#	CHANGES.txt
This commit is contained in:
Andrés de la Peña 2020-10-21 13:19:13 +01:00
parent 5bb76ba97a 72941b9ec1
commit d44dbd91c1
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

@ -5,6 +5,7 @@
* Use IF NOT EXISTS for index and UDT create statements in snapshot schema files (CASSANDRA-13935) * Use IF NOT EXISTS for index and UDT create statements in snapshot schema files (CASSANDRA-13935)
* Add flag to ignore unreplicated keyspaces during repair (CASSANDRA-15160) * Add flag to ignore unreplicated keyspaces during repair (CASSANDRA-15160)
Merged from 2.2: Merged from 2.2:
* Package tools/bin scripts as executable (CASSANDRA-16151)
* Fixed a NullPointerException when calling nodetool enablethrift (CASSANDRA-16127) * Fixed a NullPointerException when calling nodetool enablethrift (CASSANDRA-16127)
3.0.22: 3.0.22:

14
build.xml
View File

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