Merge branch 'cassandra-2.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/156e278e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/156e278e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/156e278e Branch: refs/heads/trunk Commit: 156e278ed841e5adf5172d3480af6143d844ab2f Parents: 931a518 827d93e Author: Brandon Williams <brandonwilli...@apache.org> Authored: Mon Nov 3 15:07:39 2014 -0600 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Mon Nov 3 15:07:39 2014 -0600 ---------------------------------------------------------------------- src/java/org/apache/cassandra/db/HintedHandOffManager.java | 3 +++ 1 file changed, 3 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/156e278e/src/java/org/apache/cassandra/db/HintedHandOffManager.java ----------------------------------------------------------------------