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/2ee6b8fd Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2ee6b8fd Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2ee6b8fd Branch: refs/heads/trunk Commit: 2ee6b8fd91db261dedae6e9a3539342b084056bd Parents: 5d167cf bdff106 Author: Aleksey Yeschenko <alek...@apache.org> Authored: Sun Dec 15 13:37:13 2013 +0300 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Sun Dec 15 13:37:13 2013 +0300 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../locator/AbstractReplicationStrategy.java | 35 ++++-------------- .../apache/cassandra/locator/TokenMetadata.java | 35 +++++++++++++----- .../apache/cassandra/service/StorageProxy.java | 39 +++++++++----------- 4 files changed, 53 insertions(+), 57 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2ee6b8fd/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2ee6b8fd/src/java/org/apache/cassandra/locator/TokenMetadata.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2ee6b8fd/src/java/org/apache/cassandra/service/StorageProxy.java ----------------------------------------------------------------------
