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/ab4cc9c0 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ab4cc9c0 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ab4cc9c0 Branch: refs/heads/trunk Commit: ab4cc9c007adb65631fb6f1dce614437e6856fd1 Parents: e68d466 5f62610 Author: Jonathan Ellis <jbel...@apache.org> Authored: Tue Nov 26 14:34:43 2013 -0600 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Tue Nov 26 14:34:43 2013 -0600 ---------------------------------------------------------------------- src/java/org/apache/cassandra/locator/PropertyFileSnitch.java | 2 +- src/java/org/apache/cassandra/locator/TokenMetadata.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ab4cc9c0/src/java/org/apache/cassandra/locator/TokenMetadata.java ----------------------------------------------------------------------
