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/1017fe0d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1017fe0d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1017fe0d Branch: refs/heads/cassandra-3.11 Commit: 1017fe0d8a49365e730a13ec9d851a127d1462a4 Parents: e635317 e4d0ce6 Author: Jason Brown <jasedbr...@gmail.com> Authored: Thu Nov 29 10:47:32 2018 -0800 Committer: Jason Brown <jasedbr...@gmail.com> Committed: Thu Nov 29 10:50:36 2018 -0800 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/cassandra/transport/Message.java | 16 +++++++++++++++- 2 files changed, 16 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1017fe0d/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 965d945,d63016b..b853ab0 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,6 -1,5 +1,7 @@@ -3.0.18 +3.11.4 + * Correct sstable sorting for garbagecollect and levelled compaction (CASSANDRA-14870) +Merged from 3.0: + * Netty epoll IOExceptions caused by unclean client disconnects being logged at INFO (CASSANDRA-14909) * Unfiltered.isEmpty conflicts with Row extends AbstractCollection.isEmpty (CASSANDRA-14588) * RangeTombstoneList doesn't properly clean up mergeable or superseded rts in some cases (CASSANDRA-14894) * Fix handling of collection tombstones for dropped columns from legacy sstables (CASSANDRA-14912) http://git-wip-us.apache.org/repos/asf/cassandra/blob/1017fe0d/src/java/org/apache/cassandra/transport/Message.java ---------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
