Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/65e09fa5 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/65e09fa5 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/65e09fa5 Branch: refs/heads/trunk Commit: 65e09fa5ba071f6e72987eeeea4967b2470c9337 Parents: ef6d42c fe57142 Author: Jonathan Ellis <jbel...@apache.org> Authored: Fri Feb 7 10:30:56 2014 -0600 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Fri Feb 7 10:30:56 2014 -0600 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../cassandra/db/HintedHandOffManager.java | 26 ++++++++++++-------- 2 files changed, 17 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/65e09fa5/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/65e09fa5/src/java/org/apache/cassandra/db/HintedHandOffManager.java ----------------------------------------------------------------------
