cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alek...@apache.org
Subject [3/4] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2
Date Fri, 18 Sep 2015 11:44:31 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/32457e7d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/32457e7d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/32457e7d

Branch: refs/heads/cassandra-3.0
Commit: 32457e7dff55e35c29b517b8f9cc523ed71eae36
Parents: 1de63e9 a2f0da0
Author: Aleksey Yeschenko <aleksey@apache.org>
Authored: Fri Sep 18 12:42:51 2015 +0100
Committer: Aleksey Yeschenko <aleksey@apache.org>
Committed: Fri Sep 18 12:42:51 2015 +0100

----------------------------------------------------------------------
 .../locator/GossipingPropertyFileSnitch.java          | 14 +++++++++-----
 .../apache/cassandra/locator/PropertyFileSnitch.java  | 14 +++++++++-----
 .../org/apache/cassandra/locator/TokenMetadata.java   |  2 ++
 .../org/apache/cassandra/service/StorageService.java  |  3 ++-
 4 files changed, 22 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


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

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

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


Mime
View raw message