Andrés de la Peña 83b41b6b69 Merge branch 'cassandra-3.11' into trunk ... # Conflicts: # CHANGES.txt # src/java/org/apache/cassandra/db/filter/ColumnFilter.java # test/unit/org/apache/cassandra/db/filter/ColumnFilterTest.java		2020-10-19 15:31:20 +01:00
..
CASSANDRA-15313	Prevent the JVM from crashing due to corrupt LZ4 streams	2020-02-11 11:00:24 -06:00
bloom-filter	Add Change Data Capture	2016-06-16 10:01:39 -04:00
invalid-legacy-sstables/Keyspace1	Remove pre-3.0 compatibility code for 4.0	2016-11-30 10:23:18 +01:00
jmxdump	Merge branch 'cassandra-3.11' into trunk	2020-10-19 15:31:20 +01:00
legacy-commitlog/3.4-encrypted	Remove pre-3.0 compatibility code for 4.0	2016-11-30 10:23:18 +01:00
legacy-sstables	Merge branch 'cassandra-3.0' into cassandra-3.11	2020-06-04 20:17:31 +02:00
negative-local-expiration-test	Merge branch 'cassandra-3.0' into cassandra-3.11	2018-02-10 14:59:28 -02:00
serialization	Untangle RepairMessage sub-hierarchy of messages, use new messaging (more) correctly	2019-09-20 15:52:19 -07:00