Merge branch 'cassandra-3.0' into cassandra-3.11
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/809f3b30 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/809f3b30 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/809f3b30 Branch: refs/heads/trunk Commit: 809f3b30e88b57f2c0dcf71db400710233120143 Parents: 26fedcd dfbe3fa Author: Marcus Eriksson <[email protected]> Authored: Mon Aug 28 15:39:49 2017 +0200 Committer: Marcus Eriksson <[email protected]> Committed: Mon Aug 28 15:39:49 2017 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../apache/cassandra/db/ColumnFamilyStore.java | 22 +++++++++++++++++--- .../io/sstable/format/SSTableReader.java | 19 +++++++++++++++-- .../unit/org/apache/cassandra/db/ScrubTest.java | 2 +- 4 files changed, 38 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/809f3b30/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 8fb8e2f,5ccd5cd..b0dbd60 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,11 -1,5 +1,12 @@@ -3.0.15 +3.11.1 + * Fix cassandra-stress hang issues when an error during cluster connection happens (CASSANDRA-12938) + * Better bootstrap failure message when blocked by (potential) range movement (CASSANDRA-13744) + * "ignore" option is ignored in sstableloader (CASSANDRA-13721) + * Deadlock in AbstractCommitLogSegmentManager (CASSANDRA-13652) + * Duplicate the buffer before passing it to analyser in SASI operation (CASSANDRA-13512) + * Properly evict pstmts from prepared statements cache (CASSANDRA-13641) +Merged from 3.0: + * Don't skip corrupted sstables on startup (CASSANDRA-13620) * Fix the merging of cells with different user type versions (CASSANDRA-13776) * Copy session properties on cqlsh.py do_login (CASSANDRA-13640) * Potential AssertionError during ReadRepair of range tombstone and partition deletions (CASSANDRA-13719) http://git-wip-us.apache.org/repos/asf/cassandra/blob/809f3b30/src/java/org/apache/cassandra/db/ColumnFamilyStore.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/809f3b30/src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/809f3b30/test/unit/org/apache/cassandra/db/ScrubTest.java ---------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
