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 2020-06-09 09:46:27 +02:00
parent 7bbc97e583 e49853914b
commit 6978307b79
No known key found for this signature in database
GPG Key ID: E91335D77E3E87CB
3 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -72,6 +72,7 @@ lib/jsr223/jython/cachedir
lib/jsr223/scala/*.jar
/.ant-targets-build.xml
.ant_targets
# Generated files from the documentation
doc/source/configuration/cassandra_config_file.rst

1
CHANGES.txt
View File

@ -52,6 +52,7 @@ Merged from 3.0:
* cqlsh return non-zero status when STDIN CQL fails (CASSANDRA-15623)
* Don't skip sstables in slice queries based only on local min/max/deletion timestamp (CASSANDRA-15690)
Merged from 2.2:
* Remove generated files from source artifact (CASSANDRA-15849)
* Remove duplicated tools binaries from tarballs (CASSANDRA-15768)
* Duplicate results with DISTINCT queries in mixed mode (CASSANDRA-15501)

4
build.xml
View File

@ -1256,6 +1256,10 @@
<exclude name="build/**" />
<exclude name="src/gen-java/**" />
<exclude name=".git/**" />
<exclude name="venv/**" />
<exclude name="src/resources/org/apache/cassandra/config/version.properties" />
<exclude name="conf/hotspot_compiler" />
<exclude name="doc/cql3/CQL.html" />
<exclude name="bin/*" /> <!-- handled separately below -->
<!-- exclude Eclipse files -->
<exclude name=".project" />