Updated Branches: refs/heads/cassandra-1.1 49cb6901b -> e1206f3b8 refs/heads/cassandra-1.2 1df03b36d -> 9342dddc5 refs/heads/trunk 5b0b1960d -> 0fb9da6fc
Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0fb9da6f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0fb9da6f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0fb9da6f Branch: refs/heads/trunk Commit: 0fb9da6fc02302f20cbcd1fff2e9106cdf34631d Parents: 5b0b196 9342ddd Author: Brandon Williams <brandonwilli...@apache.org> Authored: Fri Jan 4 07:39:35 2013 -0600 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Fri Jan 4 07:39:35 2013 -0600 ---------------------------------------------------------------------- .../org/apache/cassandra/service/MoveTest.java | 147 ++++++++------- 1 files changed, 76 insertions(+), 71 deletions(-) ----------------------------------------------------------------------