Merge branch 'cassandra-1.2' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/22d87444 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/22d87444 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/22d87444 Branch: refs/heads/trunk Commit: 22d87444cef2a0fe4f9a01eea313526e69c70521 Parents: 3590275 13348c4 Author: Aleksey Yeschenko <alek...@apache.org> Authored: Tue Dec 17 18:26:10 2013 +0300 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Tue Dec 17 18:26:10 2013 +0300 ---------------------------------------------------------------------- .../apache/cassandra/locator/TokenMetadata.java | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/22d87444/src/java/org/apache/cassandra/locator/TokenMetadata.java ----------------------------------------------------------------------
