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/516bdfcd Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/516bdfcd Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/516bdfcd Branch: refs/heads/trunk Commit: 516bdfcd28347636fbe3abc0d151c37445db9606 Parents: 41681e0 bdd4a92 Author: Sam Tunnicliffe <[email protected]> Authored: Wed Oct 26 17:35:08 2016 +0100 Committer: Sam Tunnicliffe <[email protected]> Committed: Wed Oct 26 17:35:08 2016 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../apache/cassandra/utils/JMXServerUtils.java | 25 ++++++++++++++++---- 2 files changed, 22 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/516bdfcd/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index fcd57c7,847bae6..d415f87 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,12 -1,5 +1,13 @@@ +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.10 + * Properly format IPv6 addresses when logging JMX service URL (CASSANDRA-12454) * Optimize the vnode allocation for single replica per DC (CASSANDRA-12777) * Use non-token restrictions for bounds when token restrictions are overridden (CASSANDRA-12419) * Fix CQLSH auto completion for PER PARTITION LIMIT (CASSANDRA-12803)
