Unverified Commit e4985391 authored by Mick Semb Wever's avatar Mick Semb Wever

Merge branch 'cassandra-3.0' into cassandra-3.11

parents 04b00498 c092c461
......@@ -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
......@@ -18,6 +18,7 @@ Merged from 3.0:
* 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)
......
......@@ -1136,6 +1136,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" />
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment