Andrés de la Peña 08be5e0c54 Merge branch 'cassandra-2.2' into cassandra-3.0 ... # Conflicts: # CHANGES.txt # src/java/org/apache/cassandra/locator/TokenMetadata.java		2021-02-01 17:23:37 +00:00
..
burn/org/apache/cassandra	Remove the SEPExecutor blocking behavior	2020-11-10 09:55:20 +01:00
conf	Fix inbound TLS enforcement	2021-01-29 10:50:20 +00:00
data	Allow recovery from the cases when CQL-created compact sense tables have bytes in EmptyType columns.	2020-06-04 20:04:27 +02:00
distributed/org/apache/cassandra	Fix inbound TLS enforcement	2021-01-29 10:50:20 +00:00
long/org/apache/cassandra	Fix updating base table rows with TTL not removing materialized view entries	2017-12-07 08:17:06 +11:00
microbench/org/apache/cassandra/test/microbench	StreamingHistogram is not thread safe	2017-09-05 09:54:27 -07:00
resources	Fixed a NullPointerException when calling nodetool enablethrift	2020-10-12 11:04:37 -07:00
unit/org/apache/cassandra	Merge branch 'cassandra-2.2' into cassandra-3.0	2021-02-01 17:23:37 +00:00