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/115cbb19 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/115cbb19 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/115cbb19 Branch: refs/heads/trunk Commit: 115cbb19c05f7c89dee6d2cc25fc90b110db7415 Parents: 4f11934 69c9e03 Author: Jonathan Ellis <jbel...@apache.org> Authored: Thu Sep 12 13:22:06 2013 +0200 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Thu Sep 12 13:22:06 2013 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/db/HintedHandOffManager.java | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/115cbb19/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/115cbb19/src/java/org/apache/cassandra/db/HintedHandOffManager.java ----------------------------------------------------------------------
