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:
Mick Semb Wever 2021-04-23 15:22:59 +02:00
parent 26bf07890e 618b48db41
commit 1ca245f5c8
No known key found for this signature in database
GPG Key ID: E91335D77E3E87CB
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.build/build-rat.xml
View File

@ -62,7 +62,10 @@
<exclude NAME="**/LICENSE.md"/> <exclude NAME="**/LICENSE.md"/>
</fileset> </fileset>
</rat:report> </rat:report>
<fail message="Some files have missing or incorrect license information. Check RAT report in ${build.dir}/rat.txt for more details!"> <exec executable="grep" outputproperty="rat.failed.files" failifexecutionfails="false">
<arg line="-A5 'Unapproved licenses' ${build.dir}/rat.txt"/>
</exec>
<fail message="Some files have missing or incorrect license information. Check RAT report in ${build.dir}/rat.txt for more details! \n ${rat.failed.files}">
<condition> <condition>
<and> <and>
<not> <not>

3
.gitignore vendored
View File

@ -10,6 +10,7 @@ conf/hotspot_compiler
doc/cql3/CQL.html doc/cql3/CQL.html
doc/build/ doc/build/
lib/ lib/
pylib/src/
!lib/cassandra-driver-internal-only-*.zip !lib/cassandra-driver-internal-only-*.zip
# C* debs # C* debs
@ -29,7 +30,7 @@ debian/files
# IntelliJ # IntelliJ
.idea/ .idea/
*.eml *.eml
*.iml **/*.iml
*.ipr *.ipr
*.iws *.iws