Merge branch 'cassandra-3.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1aeeff47 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1aeeff47 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1aeeff47 Branch: refs/heads/trunk Commit: 1aeeff47ada8a81965d5fd70f8a40c6511dd0cb8 Parents: 2ae587f f0cd326 Author: Yuki Morishita <[email protected]> Authored: Mon Apr 11 11:31:56 2016 -0500 Committer: Yuki Morishita <[email protected]> Committed: Mon Apr 11 11:31:56 2016 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../apache/cassandra/repair/RepairRunnable.java | 10 ++ .../cassandra/service/ActiveRepairService.java | 11 ++ .../cassandra/service/StorageService.java | 28 ++++- .../progress/jmx/LegacyJMXProgressSupport.java | 107 +++++++++++++++++ .../jmx/LegacyJMXProgressSupportTest.java | 118 +++++++++++++++++++ 6 files changed, 269 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1aeeff47/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 3adde47,8c40e63..f399fd9 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -46,15 -5,10 +46,16 @@@ Merged from 3.0 header is received (CASSANDRA-11464) * Validate that num_tokens and initial_token are consistent with one another (CASSANDRA-10120) Merged from 2.2: + * Make deprecated repair methods backward-compatible with previous notification service (CASSANDRA-11430) * IncomingStreamingConnection version check message wrong (CASSANDRA-11462) -3.0.5 + +3.5 + * StaticTokenTreeBuilder should respect posibility of duplicate tokens (CASSANDRA-11525) + * Correctly fix potential assertion error during compaction (CASSANDRA-11353) + * Avoid index segment stitching in RAM which lead to OOM on big SSTable files (CASSANDRA-11383) + * Fix clustering and row filters for LIKE queries on clustering columns (CASSANDRA-11397) +Merged from 3.0: * Fix rare NPE on schema upgrade from 2.x to 3.x (CASSANDRA-10943) * Improve backoff policy for cqlsh COPY FROM (CASSANDRA-11320) * Improve IF NOT EXISTS check in CREATE INDEX (CASSANDRA-11131) http://git-wip-us.apache.org/repos/asf/cassandra/blob/1aeeff47/src/java/org/apache/cassandra/repair/RepairRunnable.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1aeeff47/src/java/org/apache/cassandra/service/StorageService.java ----------------------------------------------------------------------
