Updated Branches: refs/heads/cassandra-1.2 43123d1cc -> 17adf8e4f refs/heads/trunk 47de14731 -> 262fadb27
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/262fadb2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/262fadb2 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/262fadb2 Branch: refs/heads/trunk Commit: 262fadb27c568b801c0982000c017c0cb3bb9bb2 Parents: 47de147 17adf8e Author: Brandon Williams <brandonwilli...@apache.org> Authored: Fri Jan 18 13:58:58 2013 -0600 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Fri Jan 18 13:58:58 2013 -0600 ---------------------------------------------------------------------- .../org/apache/cassandra/service/RelocateTest.java | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) ----------------------------------------------------------------------
