This is an automated email from the ASF dual-hosted git repository. mck pushed a commit to branch cassandra-3.11 in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 0bea2fac8c117b9701978070f591c1b328dba39a Merge: 3df63ed 2b10a5f Author: Mick Semb Wever <[email protected]> AuthorDate: Thu Aug 22 10:54:40 2019 +0200 Merge branch 'cassandra-3.0' into cassandra-3.11 CHANGES.txt | 1 + src/java/org/apache/cassandra/db/LegacyLayout.java | 5 ++- .../org/apache/cassandra/db/LegacyLayoutTest.java | 36 +++++++++++++++++++--- 3 files changed, 34 insertions(+), 8 deletions(-) diff --cc CHANGES.txt index 772446d,3f2b4d0..2a56985 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,9 -1,5 +1,10 @@@ -3.0.19 +3.11.5 + * Make sure user defined compaction transactions are always closed (CASSANDRA-15123) + * Fix cassandra-env.sh to use $CASSANDRA_CONF to find cassandra-jaas.config (CASSANDRA-14305) + * Fixed nodetool cfstats printing index name twice (CASSANDRA-14903) + * Add flag to disable SASI indexes, and warnings on creation (CASSANDRA-14866) +Merged from 3.0: + * Fix LegacyLayout RangeTombstoneList IndexOutOfBoundsException when upgrading and RangeTombstone bounds are asymmetric (CASSANDRA-15172) * Fix NPE when using allocate_tokens_for_keyspace on new DC/rack (CASSANDRA-14952) * Filter sstables earlier when running cleanup (CASSANDRA-15100) * Use mean row count instead of mean column count for index selectivity calculation (CASSANDRA-15259) diff --cc test/unit/org/apache/cassandra/db/LegacyLayoutTest.java index a119b29,77197d3..4058b03 --- a/test/unit/org/apache/cassandra/db/LegacyLayoutTest.java +++ b/test/unit/org/apache/cassandra/db/LegacyLayoutTest.java @@@ -24,8 -24,8 +24,9 @@@ import java.nio.file.Files import java.nio.file.Path; import java.nio.file.Paths; +import org.junit.AfterClass; import org.apache.cassandra.db.filter.ColumnFilter; + import org.apache.cassandra.db.partitions.ImmutableBTreePartition; import org.apache.cassandra.db.rows.BufferCell; import org.apache.cassandra.db.rows.Cell; import org.apache.cassandra.db.rows.RowIterator; --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
