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/55fe548f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/55fe548f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/55fe548f Branch: refs/heads/trunk Commit: 55fe548f6f677e015adebb3f81bc549a8f9b9dc1 Parents: d4fd04e 39d77f4 Author: Paulo Motta <[email protected]> Authored: Fri Dec 23 21:28:36 2016 -0200 Committer: Paulo Motta <[email protected]> Committed: Fri Dec 23 21:28:36 2016 -0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../cassandra/service/StorageService.java | 55 +++++++++++++++----- .../cassandra/service/StorageServiceMBean.java | 3 +- .../org/apache/cassandra/tools/NodeProbe.java | 4 +- .../cassandra/tools/nodetool/Decommission.java | 9 +++- 5 files changed, 56 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/55fe548f/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 16d7dc6,c5fcec8..b412f11 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,14 -1,5 +1,15 @@@ +4.0 + * Thrift removal (CASSANDRA-11115) + * 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 + * Require forceful decommission if number of nodes is less than replication factor (CASSANDRA-12510) * Allow IN restrictions on column families with collections (CASSANDRA-12654) * Move to FastThreadLocalThread and FastThreadLocal (CASSANDRA-13034) * nodetool stopdaemon errors out (CASSANDRA-13030) http://git-wip-us.apache.org/repos/asf/cassandra/blob/55fe548f/src/java/org/apache/cassandra/service/StorageService.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/55fe548f/src/java/org/apache/cassandra/service/StorageServiceMBean.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/55fe548f/src/java/org/apache/cassandra/tools/NodeProbe.java ----------------------------------------------------------------------
