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/93a06b9e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/93a06b9e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/93a06b9e Branch: refs/heads/trunk Commit: 93a06b9ea92f211abbf0ea7ed4113de2434f8b8a Parents: 516bdfc 8f0d5a2 Author: Robert Stupp <[email protected]> Authored: Thu Oct 27 11:43:07 2016 +0200 Committer: Robert Stupp <[email protected]> Committed: Thu Oct 27 11:43:07 2016 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + build.xml | 2 - lib/licenses/primitive-1.0.txt | 201 ----- lib/licenses/snowball-stemmer-1.3.0.581.1.txt | 204 +---- lib/primitive-1.0.jar | Bin 52589 -> 0 bytes .../cassandra/index/sasi/sa/SuffixSA.java | 4 +- .../org/apache/cassandra/utils/LongTimSort.java | 868 +++++++++++++++++++ 7 files changed, 880 insertions(+), 400 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/93a06b9e/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index d415f87,89c94dd..5991e84 --- 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 + * remove net.mintern.primitive library due to license issue (CASSANDRA-12845) * 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) http://git-wip-us.apache.org/repos/asf/cassandra/blob/93a06b9e/build.xml ----------------------------------------------------------------------
