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/d76ad2e2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d76ad2e2 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d76ad2e2 Branch: refs/heads/cassandra-2.0 Commit: d76ad2e2443d1884473c845ab77d69025560d03c Parents: bcb294d 5f6c5ce Author: Brandon Williams <brandonwilli...@apache.org> Authored: Fri Jan 31 09:40:17 2014 -0600 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Fri Jan 31 09:40:17 2014 -0600 ---------------------------------------------------------------------- .../org/apache/cassandra/locator/DynamicEndpointSnitchTest.java | 2 +- test/unit/org/apache/cassandra/service/InitClientTest.java | 2 +- .../org/apache/cassandra/service/StorageServiceClientTest.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d76ad2e2/test/unit/org/apache/cassandra/locator/DynamicEndpointSnitchTest.java ----------------------------------------------------------------------
