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/a92ca615 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a92ca615 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a92ca615 Branch: refs/heads/trunk Commit: a92ca615487e0915723cba4ffe3a070afa88cdfe Parents: 5364310 8d1c33f Author: Jason Brown <[email protected]> Authored: Mon Dec 12 10:41:25 2016 -0800 Committer: Jason Brown <[email protected]> Committed: Mon Dec 12 10:42:05 2016 -0800 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/tools/nodetool/StopDaemon.java | 2 ++ 2 files changed, 3 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a92ca615/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 5d93b8a,7a7f21c..f59f89f --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,13 -1,5 +1,14 @@@ +4.0 + * Remove pre-3.0 compatibility code for 4.0 (CASSANDRA-12716) + * 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 + * nodetool stopdaemon errors out (CASSANDRA-13030) * Log message size in trace message in OutboundTcpConnection (CASSANDRA-13028) * Add timeUnit Days for cassandra-stress (CASSANDRA-13029) * Add mutation size and batch metrics (CASSANDRA-12649)
