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/a13c6dcb Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a13c6dcb Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a13c6dcb Branch: refs/heads/trunk Commit: a13c6dcbb7a6ba74b27e50eef4bfd0f80eaea121 Parents: c384d31 ab4cc9c Author: Jonathan Ellis <jbel...@apache.org> Authored: Tue Nov 26 14:34:50 2013 -0600 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Tue Nov 26 14:34:50 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/a13c6dcb/src/java/org/apache/cassandra/locator/PropertyFileSnitch.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a13c6dcb/src/java/org/apache/cassandra/locator/TokenMetadata.java ----------------------------------------------------------------------
