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/f943433a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f943433a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f943433a Branch: refs/heads/trunk Commit: f943433ae8f62f2ecb2c21e7be924ded09d669f2 Parents: c821d8b 22d8744 Author: Aleksey Yeschenko <alek...@apache.org> Authored: Tue Dec 17 18:26:46 2013 +0300 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Tue Dec 17 18:26:46 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/f943433a/src/java/org/apache/cassandra/locator/TokenMetadata.java ----------------------------------------------------------------------
