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/32dbe582 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/32dbe582 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/32dbe582 Branch: refs/heads/trunk Commit: 32dbe58254115b8a92a97e95566bb4374bb9c051 Parents: 1334f94 d8c4e89 Author: Marcus Eriksson <marc...@spotify.com> Authored: Wed Dec 4 20:17:38 2013 +0100 Committer: Marcus Eriksson <marc...@spotify.com> Committed: Wed Dec 4 20:17:38 2013 +0100 ---------------------------------------------------------------------- test/unit/org/apache/cassandra/service/MoveTest.java | 2 ++ 1 file changed, 2 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/32dbe582/test/unit/org/apache/cassandra/service/MoveTest.java ---------------------------------------------------------------------- diff --cc test/unit/org/apache/cassandra/service/MoveTest.java index f239671,07a9590..6ecd500 --- a/test/unit/org/apache/cassandra/service/MoveTest.java +++ b/test/unit/org/apache/cassandra/service/MoveTest.java @@@ -197,12 -198,13 +198,13 @@@ public class MoveTes ss.onChange(boot2, ApplicationState.STATUS, valueFactory.bootstrapping(Collections.<Token>singleton(keyTokens.get(7)))); + PendingRangeCalculatorService.instance.blockUntilFinished(); // don't require test update every time a new keyspace is added to test/conf/cassandra.yaml - Map<String, AbstractReplicationStrategy> tableStrategyMap = new HashMap<String, AbstractReplicationStrategy>(); + Map<String, AbstractReplicationStrategy> keyspaceStrategyMap = new HashMap<String, AbstractReplicationStrategy>(); for (int i = 1; i <= 4; i++) { - tableStrategyMap.put("Keyspace" + i, getStrategy("Keyspace" + i, tmd)); + keyspaceStrategyMap.put("Keyspace" + i, getStrategy("Keyspace" + i, tmd)); } /**
