Updated Branches: refs/heads/cassandra-1.1 2820f050d -> 33f1bacbf refs/heads/trunk b3915f51f -> aa267059c
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/aa267059 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/aa267059 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/aa267059 Branch: refs/heads/trunk Commit: aa267059c77c3ac8537fd3542e15dd0b6ee4570d Parents: b993eec 33f1bac Author: Jonathan Ellis <[email protected]> Authored: Thu Jun 14 16:20:49 2012 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Thu Jun 14 16:20:49 2012 -0500 ---------------------------------------------------------------------- .../apache/cassandra/db/HintedHandOffManager.java | 16 +++++++------- 1 files changed, 8 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/aa267059/src/java/org/apache/cassandra/db/HintedHandOffManager.java ----------------------------------------------------------------------
