Merge branch 'cassandra-3.0' into cassandra-3.7
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/075403c7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/075403c7 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/075403c7 Branch: refs/heads/trunk Commit: 075403c787e44da09871a35130c3c67a2d07a7b9 Parents: b2a9c56 361c4e4 Author: Robert Stupp <sn...@snazy.de> Authored: Tue May 24 09:48:08 2016 +0200 Committer: Robert Stupp <sn...@snazy.de> Committed: Tue May 24 09:48:08 2016 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../apache/cassandra/io/util/NIODataInputStream.java | 12 ++++-------- 2 files changed, 5 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/075403c7/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 15d5f2e,ac5321d..e7773e2 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -6,11 -4,10 +6,12 @@@ Merged from 3.0 * Refactor Materialized View code (CASSANDRA-11475) * Update Java Driver (CASSANDRA-11615) Merged from 2.2: + * Possible memory leak in NIODataInputStream (CASSANDRA-11867) * Add message dropped tasks to nodetool netstats (CASSANDRA-11855) * Add seconds to cqlsh tracing session duration (CASSANDRA-11753) + * Fix commit log replay after out-of-order flush completion (CASSANDRA-9669) * Prohibit Reversed Counter type as part of the PK (CASSANDRA-9395) + * cqlsh: correctly handle non-ascii chars in error messages (CASSANDRA-11626) Merged from 2.1: * Avoid holding SSTableReaders for duration of incremental repair (CASSANDRA-11739)
