Merge branch 'cassandra-3.11' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4dd7faa7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4dd7faa7 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4dd7faa7 Branch: refs/heads/trunk Commit: 4dd7faa75210f635af36c0852e9b0d2e8bdbb95c Parents: 82305d1 6a449b8 Author: Jay Zhuang <jay.zhu...@yahoo.com> Authored: Thu Dec 6 16:43:48 2018 -0800 Committer: Jay Zhuang <jay.zhu...@yahoo.com> Committed: Thu Dec 6 16:48:25 2018 -0800 ---------------------------------------------------------------------- CHANGES.txt | 1 + tools/stress/src/org/apache/cassandra/stress/StressAction.java | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4dd7faa7/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 847e772,369d96e..75b05ea --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -338,6 -2,8 +338,7 @@@ * Make stop-server.bat wait for Cassandra to terminate (CASSANDRA-14829) * Correct sstable sorting for garbagecollect and levelled compaction (CASSANDRA-14870) Merged from 3.0: + * Fix cassandra-stress write hang with default options (CASSANDRA-14616) - * Differentiate between slices and RTs when decoding legacy bounds (CASSANDRA-14919) * 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) http://git-wip-us.apache.org/repos/asf/cassandra/blob/4dd7faa7/tools/stress/src/org/apache/cassandra/stress/StressAction.java ---------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
