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/5f64ed7c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5f64ed7c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5f64ed7c Branch: refs/heads/trunk Commit: 5f64ed7cc2d62543f0be7b5eb09bd2495a0e4f3a Parents: 4d5a53e a449e8f Author: Carl Yeksigian <c...@apache.org> Authored: Mon Dec 5 11:41:52 2016 -0500 Committer: Carl Yeksigian <c...@apache.org> Committed: Mon Dec 5 11:41:52 2016 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/service/StorageService.java | 9 +++++---- 2 files changed, 6 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5f64ed7c/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 8cdca57,302becf..5cacdd0 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,11 -1,5 +1,12 @@@ -2.2.9 +3.0.11 + * 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: + * 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) * Avoid blocking gossip during pending range calculation (CASSANDRA-12281) http://git-wip-us.apache.org/repos/asf/cassandra/blob/5f64ed7c/src/java/org/apache/cassandra/service/StorageService.java ----------------------------------------------------------------------
