cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alek...@apache.org
Subject [09/10] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.X
Date Fri, 18 Nov 2016 17:39:14 GMT
Merge branch 'cassandra-3.0' into cassandra-3.X


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/96d67b10
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/96d67b10
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/96d67b10

Branch: refs/heads/trunk
Commit: 96d67b109a2ef858c2753bbb9853d01460cb8f8e
Parents: f33cd55 59b40b3
Author: Aleksey Yeschenko <aleksey@apache.org>
Authored: Fri Nov 18 17:31:11 2016 +0000
Committer: Aleksey Yeschenko <aleksey@apache.org>
Committed: Fri Nov 18 17:38:31 2016 +0000

----------------------------------------------------------------------
 CHANGES.txt                                     |   2 +-
 .../apache/cassandra/locator/TokenMetadata.java | 211 +++++++++++--------
 .../service/PendingRangeCalculatorService.java  |   6 +-
 .../gms/PendingRangeCalculatorServiceTest.java  | 133 ++++++++++++
 4 files changed, 264 insertions(+), 88 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/96d67b10/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index ee73b81,bcd0b5c..2826011
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -150,7 -40,6 +150,7 @@@ Merged from 3.0
   * Correct log message for statistics of offheap memtable flush (CASSANDRA-12776)
   * Explicitly set locale for string validation (CASSANDRA-12541,CASSANDRA-12542,CASSANDRA-12543,CASSANDRA-12545)
  Merged from 2.2:
- =======
++ * Avoid blocking gossip during pending range calculation (CASSANDRA-12281)
   * Fix purgeability of tombstones with max timestamp (CASSANDRA-12792)
   * Fail repair if participant dies during sync or anticompaction (CASSANDRA-12901)
   * cqlsh COPY: unprotected pk values before converting them if not using prepared statements
(CASSANDRA-12863)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/96d67b10/src/java/org/apache/cassandra/locator/TokenMetadata.java
----------------------------------------------------------------------


Mime
View raw message