Updated Branches: refs/heads/cassandra-1.1 310bf3485 -> 577cb2c76 refs/heads/cassandra-1.2 0820b20fb -> 6d3ef440d refs/heads/trunk 4e9d01f50 -> 50b8bf2c1
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/50b8bf2c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/50b8bf2c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/50b8bf2c Branch: refs/heads/trunk Commit: 50b8bf2c18bb615c11fcf718a557b77901c9f594 Parents: 4e9d01f 6d3ef44 Author: Brandon Williams <[email protected]> Authored: Mon Feb 11 13:06:05 2013 -0600 Committer: Brandon Williams <[email protected]> Committed: Mon Feb 11 13:06:05 2013 -0600 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../apache/cassandra/db/HintedHandOffManager.java | 15 ++++++--------- 2 files changed, 7 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/50b8bf2c/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/50b8bf2c/src/java/org/apache/cassandra/db/HintedHandOffManager.java ----------------------------------------------------------------------
