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/05 15:29:02 UTC

[08/20] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.3

Merge branch 'cassandra-3.0' into cassandra-3.3


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

Branch: refs/heads/cassandra-3.3
Commit: 0bb3a8db272eca50dcf46938acbe473fe69045a3
Parents: dbd5ce1 5ad8010
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Tue Jan 5 15:25:07 2016 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Tue Jan 5 15:25:07 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/0bb3a8db/src/java/org/apache/cassandra/locator/TokenMetadata.java
----------------------------------------------------------------------

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