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/15abe2db Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/15abe2db Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/15abe2db Branch: refs/heads/cassandra-3.11 Commit: 15abe2db958cc9c373d00800c5b436c4d2617f5f Parents: 2fd33ba 9186679 Author: AndreÌs de la PenÌa <a.penya.gar...@gmail.com> Authored: Mon Aug 7 20:28:01 2017 +0100 Committer: AndreÌs de la PenÌa <a.penya.gar...@gmail.com> Committed: Mon Aug 7 20:28:01 2017 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/db/view/ViewManager.java | 9 +++++++++ 2 files changed, 10 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/15abe2db/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 45ed523,905a436..b8c4bde --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,9 -1,5 +1,10 @@@ -3.0.15 +3.11.1 + * "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: + * Skip materialized view addition if the base table doesn't exist (CASSANDRA-13737) * Drop table should remove corresponding entries in dropped_columns table (CASSANDRA-13730) * Log warn message until legacy auth tables have been migrated (CASSANDRA-13371) * Fix incorrect [2.1 <- 3.0] serialization of counter cells created in 2.0 (CASSANDRA-13691) http://git-wip-us.apache.org/repos/asf/cassandra/blob/15abe2db/src/java/org/apache/cassandra/db/view/ViewManager.java ---------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
