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/f15d6d59 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f15d6d59 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f15d6d59 Branch: refs/heads/trunk Commit: f15d6d591a569eb399bcd2b472b65ed1f8e15b90 Parents: a13c6dc f15681b Author: Jonathan Ellis <jbel...@apache.org> Authored: Tue Nov 26 14:39:47 2013 -0600 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Tue Nov 26 14:39:47 2013 -0600 ---------------------------------------------------------------------- src/java/org/apache/cassandra/locator/TokenMetadata.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f15d6d59/src/java/org/apache/cassandra/locator/TokenMetadata.java ----------------------------------------------------------------------
