tree e69733855b6f8a82eb7c3ceec294772ae4d51a30
parent 979a71b13af0fac643a6cd6957e74313139ed17d
parent 257fb0377343cbfdb58327da17f31d4eaed940f5
author adelapena <a.penya.garcia@gmail.com> 1594400658 +0100
committer adelapena <a.penya.garcia@gmail.com> 1594400658 +0100

Merge branch 'cassandra-2.2' into cassandra-3.0

# Conflicts:
#	CHANGES.txt
#	src/java/org/apache/cassandra/db/ColumnFamilyStore.java
#	test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java