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

This commit is contained in:
Mick Semb Wever 2020-06-08 22:33:09 +02:00
parent 880b07c2e6 334024751c
commit c092c4610e
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

@ -71,3 +71,4 @@ lib/jsr223/jython/*.jar
lib/jsr223/jython/cachedir
lib/jsr223/scala/*.jar
.ant_targets

1
CHANGES.txt
View File

@ -14,6 +14,7 @@
* Memtable memory allocations may deadlock (CASSANDRA-15367)
* Run evictFromMembership in GossipStage (CASSANDRA-15592)
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)
* Disable JMX rebinding (CASSANDRA-15653)

4
build.xml
View File

@ -1104,6 +1104,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" />