Merge branch 'cassandra-3.X' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/50b8be4e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/50b8be4e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/50b8be4e Branch: refs/heads/trunk Commit: 50b8be4e7da5ac9be931cf7f76ce88ec24b0d47f Parents: b7ccd51 4004302 Author: Sam Tunnicliffe <s...@beobal.com> Authored: Tue Nov 29 17:21:10 2016 +0000 Committer: Sam Tunnicliffe <s...@beobal.com> Committed: Tue Nov 29 17:21:10 2016 +0000 ---------------------------------------------------------------------- CHANGES.txt | 11 +++++------ src/java/org/apache/cassandra/dht/LocalPartitioner.java | 10 ++++++++-- 2 files changed, 13 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/50b8be4e/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index f203419,fb85765..8e98260 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,10 -1,3 +1,11 @@@ +4.0 + * Add column definition kind to dropped columns in schema (CASSANDRA-12705) + * Add (automate) Nodetool Documentation (CASSANDRA-12672) + * Update bundled cqlsh python driver to 3.7.0 (CASSANDRA-12736) + * Reject invalid replication settings when creating or altering a keyspace (CASSANDRA-12681) + * Clean up the SSTableReader#getScanner API wrt removal of RateLimiter (CASSANDRA-12422) + ++ 3.12 * Remove timing window in test case (CASSANDRA-12875) * Resolve unit testing without JCE security libraries installed (CASSANDRA-12945) @@@ -121,8 -110,9 +118,9 @@@ * Remove pre-startup check for open JMX port (CASSANDRA-12074) * Remove compaction Severity from DynamicEndpointSnitch (CASSANDRA-11738) * Restore resumable hints delivery (CASSANDRA-11960) - * Properly report LWT contention (CASSANDRA-12626) + * Properly record CAS contention (CASSANDRA-12626) Merged from 3.0: + * 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) * Pass root cause to CorruptBlockException when uncompression failed (CASSANDRA-12889)
