Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/752f5d56 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/752f5d56 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/752f5d56 Branch: refs/heads/cassandra-3.0 Commit: 752f5d566a5fd01518071943beda9945e0703cef Parents: d9b06e8 dd41526 Author: Paulo Motta <[email protected]> Authored: Thu Dec 8 17:24:22 2016 -0200 Committer: Paulo Motta <[email protected]> Committed: Thu Dec 8 17:24:22 2016 -0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/config/Config.java | 6 +++++- src/java/org/apache/cassandra/config/DatabaseDescriptor.java | 5 +++++ .../org/apache/cassandra/net/OutboundTcpConnectionPool.java | 4 ++-- 4 files changed, 13 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/752f5d56/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 21cf5be,6b2a9c0..1da48bd --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,13 -1,5 +1,14 @@@ -2.2.9 +3.0.11 + * CQL often queries static columns unnecessarily (CASSANDRA-12768) + * Make sure sstables only get committed when it's safe to discard commit log records (CASSANDRA-12956) + * Reject default_time_to_live option when creating or altering MVs (CASSANDRA-12868) + * Nodetool should use a more sane max heap size (CASSANDRA-12739) + * LocalToken ensures token values are cloned on heap (CASSANDRA-12651) + * AnticompactionRequestSerializer serializedSize is incorrect (CASSANDRA-12934) + * Prevent reloading of logback.xml from UDF sandbox (CASSANDRA-12535) + * Reenable HeapPool (CASSANDRA-12900) +Merged from 2.2: + * Do not specify local address on outgoing connection when listen_on_broadcast_address is set (CASSANDRA-12673) * Use saved tokens when setting local tokens on StorageService.joinRing (CASSANDRA-12935) * cqlsh: fix DESC TYPES errors (CASSANDRA-12914) * Fix leak on skipped SSTables in sstableupgrade (CASSANDRA-12899) http://git-wip-us.apache.org/repos/asf/cassandra/blob/752f5d56/src/java/org/apache/cassandra/config/Config.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/752f5d56/src/java/org/apache/cassandra/config/DatabaseDescriptor.java ----------------------------------------------------------------------
