You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@cassandra.apache.org by sl...@apache.org on 2016/01/07 11:24:39 UTC

[3/3] cassandra git commit: Merge branch 'cassandra-3.3' into trunk

Merge branch 'cassandra-3.3' into trunk


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

Branch: refs/heads/trunk
Commit: 6ec5d55b9100cdfd6b4d2c67018442abd5ac1b04
Parents: 25090c1 ffc0840
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Thu Jan 7 11:24:25 2016 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Thu Jan 7 11:24:25 2016 +0100

----------------------------------------------------------------------
 .../apache/cassandra/locator/TokenMetadata.java | 61 ++++++++++----------
 .../cassandra/service/StorageService.java       |  2 +-
 2 files changed, 32 insertions(+), 31 deletions(-)
----------------------------------------------------------------------


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