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/d4bf6d32 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d4bf6d32 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d4bf6d32 Branch: refs/heads/trunk Commit: d4bf6d3283b4eaacbf4e4deab339ed8259db7902 Parents: 0afad2c 6127f85 Author: Sylvain Lebresne <[email protected]> Authored: Thu May 22 12:34:46 2014 +0200 Committer: Sylvain Lebresne <[email protected]> Committed: Thu May 22 12:34:46 2014 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/db/HintedHandOffManager.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d4bf6d32/CHANGES.txt ----------------------------------------------------------------------
