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/459946ae Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/459946ae Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/459946ae Branch: refs/heads/trunk Commit: 459946aeef05e2a5a0db7b61b48861eb54958b08 Parents: c47d395 d582d03 Author: T Jake Luciani <[email protected]> Authored: Mon Nov 7 14:10:15 2016 -0500 Committer: T Jake Luciani <[email protected]> Committed: Mon Nov 7 14:10:15 2016 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + tools/stress/src/org/apache/cassandra/stress/StressAction.java | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/459946ae/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index bbe79e6,bdb6e29..21f179f --- 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 + * Fix cassandra-stress truncate option (CASSANDRA-12695) * Fix crossNode value when receiving messages (CASSANDRA-12791) * Don't load MX4J beans twice (CASSANDRA-12869) * Extend native protocol request flags, add versions to SUPPORTED, and introduce ProtocolVersion enum (CASSANDRA-12838)
