cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alek...@apache.org
Subject [3/5] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2
Date Wed, 16 Sep 2015 11:05:34 GMT
Merge branch 'cassandra-2.1' into cassandra-2.2


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

Branch: refs/heads/trunk
Commit: 5b05b682641f634d8b6548d225b9130b771df969
Parents: e7c2952 4b1d59e
Author: Aleksey Yeschenko <aleksey@apache.org>
Authored: Wed Sep 16 11:48:56 2015 +0100
Committer: Aleksey Yeschenko <aleksey@apache.org>
Committed: Wed Sep 16 11:48:56 2015 +0100

----------------------------------------------------------------------
 CHANGES.txt                                     |   1 +
 .../locator/GossipingPropertyFileSnitch.java    |   1 +
 .../cassandra/locator/PropertyFileSnitch.java   |   1 +
 .../apache/cassandra/locator/TokenMetadata.java | 142 +++++++++----
 .../cassandra/service/StorageService.java       |  16 ++
 .../cassandra/locator/TokenMetadataTest.java    | 209 ++++++++++++++++++-
 6 files changed, 332 insertions(+), 38 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/5b05b682/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index b0ade42,12523be..7b5fa78
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -20,8 -10,8 +20,9 @@@ Merged from 2.1
   * Only check KeyCache when it is enabled
   * Change streaming_socket_timeout_in_ms default to 1 hour (CASSANDRA-8611)
   * (cqlsh) update list of CQL keywords (CASSANDRA-9232)
 + * Add nodetool gettraceprobability command (CASSANDRA-10234)
  Merged from 2.0:
+  * Fix consolidating racks violating the RF contract (CASSANDRA-10238)
   * Disallow decommission when node is in drained state (CASSANDRA-8741)
  
  

http://git-wip-us.apache.org/repos/asf/cassandra/blob/5b05b682/src/java/org/apache/cassandra/locator/PropertyFileSnitch.java
----------------------------------------------------------------------

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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/5b05b682/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------


Mime
View raw message