Updated Branches: refs/heads/cassandra-1.2 275fae9cf -> 2f3b8d4b3 refs/heads/cassandra-1.2.0 309666b4d -> add2d2db6 refs/heads/trunk db555f7f0 -> 0608330c5
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/0608330c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0608330c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0608330c Branch: refs/heads/trunk Commit: 0608330c55c3c15de280c3e2a137ed798e122a6e Parents: db555f7 2f3b8d4 Author: Brandon Williams <brandonwilli...@apache.org> Authored: Thu Nov 15 11:58:07 2012 -0600 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Thu Nov 15 11:58:07 2012 -0600 ---------------------------------------------------------------------- .../apache/cassandra/db/HintedHandOffManager.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) ----------------------------------------------------------------------