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/c7e6eee5 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c7e6eee5 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c7e6eee5 Branch: refs/heads/cassandra-3.11 Commit: c7e6eee58d0ef207224a24fe0d99507f1af06771 Parents: c34a0f5 30d2835 Author: Marcus Eriksson <marc...@apache.org> Authored: Fri Sep 28 12:54:08 2018 +0200 Committer: Marcus Eriksson <marc...@apache.org> Committed: Fri Sep 28 12:54:08 2018 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../cassandra/index/SecondaryIndexManager.java | 5 ++- .../apache/cassandra/index/CustomIndexTest.java | 32 ++++++++++++++++++++ 3 files changed, 37 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c7e6eee5/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 20cec87,70b2996..dfc0eeb --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,5 -1,5 +1,6 @@@ -3.0.18 +3.11.4 +Merged from 3.0: + * Avoid calling iter.next() in a loop when notifying indexers about range tombstones (CASSANDRA-14794) * Fix purging semi-expired RT boundaries in reversed iterators (CASSANDRA-14672) * DESC order reads can fail to return the last Unfiltered in the partition (CASSANDRA-14766) * Fix corrupted collection deletions for dropped columns in 3.0 <-> 2.{1,2} messages (CASSANDRA-14568) http://git-wip-us.apache.org/repos/asf/cassandra/blob/c7e6eee5/src/java/org/apache/cassandra/index/SecondaryIndexManager.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c7e6eee5/test/unit/org/apache/cassandra/index/CustomIndexTest.java ---------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
