cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject [6/6] git commit: Merge branch 'cassandra-2.0' into trunk
Date Tue, 26 Nov 2013 20:13:19 GMT
Merge branch 'cassandra-2.0' into trunk


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

Branch: refs/heads/trunk
Commit: 1bfd062fdc9daa35fbabcebb3ac31e726504f1ff
Parents: 9f3a7f8 504f66d
Author: Jonathan Ellis <jbellis@apache.org>
Authored: Tue Nov 26 14:13:06 2013 -0600
Committer: Jonathan Ellis <jbellis@apache.org>
Committed: Tue Nov 26 14:13:06 2013 -0600

----------------------------------------------------------------------
 CHANGES.txt                                     |  1 +
 .../locator/AbstractReplicationStrategy.java    | 58 +++++++++++++-------
 .../apache/cassandra/locator/TokenMetadata.java | 49 +++++++----------
 3 files changed, 60 insertions(+), 48 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/1bfd062f/CHANGES.txt
----------------------------------------------------------------------

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


Mime
View raw message