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/77eec6df Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/77eec6df Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/77eec6df Branch: refs/heads/trunk Commit: 77eec6dfd4e68ca8a591b72544a1eb4bfa02decf Parents: 95bcaef b0ed0f4 Author: Tyler Hobbs <tylerlho...@gmail.com> Authored: Wed Feb 22 10:11:16 2017 -0600 Committer: Tyler Hobbs <tylerlho...@gmail.com> Committed: Wed Feb 22 10:11:16 2017 -0600 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/service/CassandraDaemon.java | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/77eec6df/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index b4eaf63,6dd4edb..58e9e78 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -63,12 -26,11 +63,13 @@@ Merged from 2.2 * Fix negative mean latency metric (CASSANDRA-12876) * Use only one file pointer when creating commitlog segments (CASSANDRA-12539) Merged from 2.1: + * Log stacktrace of uncaught exceptions (CASSANDRA-13108) * Use portable stderr for java error in startup (CASSANDRA-13211) * Fix Thread Leak in OutboundTcpConnection (CASSANDRA-13204) + * Upgrade netty version to fix memory leak with client encryption (CASSANDRA-13114) * Coalescing strategy can enter infinite loop (CASSANDRA-13159) + 3.10 * Fix secondary index queries regression (CASSANDRA-13013) * Add duration type to the protocol V5 (CASSANDRA-12850) http://git-wip-us.apache.org/repos/asf/cassandra/blob/77eec6df/src/java/org/apache/cassandra/service/CassandraDaemon.java ----------------------------------------------------------------------
