Updated Branches: refs/heads/cassandra-1.1 9a336a192 -> a277fbedb refs/heads/trunk e9b692586 -> f297f54ed
Merge branch 'cassandra-1.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f297f54e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f297f54e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f297f54e Branch: refs/heads/trunk Commit: f297f54edf327ea070ce1a6afac943fd93ab8e47 Parents: e9b6925 a277fbe Author: Jonathan Ellis <jbel...@apache.org> Authored: Tue Feb 7 17:00:24 2012 -0600 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Tue Feb 7 17:00:24 2012 -0600 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/dht/Range.java | 6 + .../apache/cassandra/service/StorageService.java | 61 ++-- .../locator/OldNetworkTopologyStrategyTest.java | 218 ++++++++++++++- 4 files changed, 250 insertions(+), 36 deletions(-) ----------------------------------------------------------------------
