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/0d815af6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0d815af6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0d815af6 Branch: refs/heads/trunk Commit: 0d815af68fbbafca429b2f45e1d9bf1eb13b7024 Parents: c844081 029cd40 Author: Aleksey Yeschenko <[email protected]> Authored: Fri Jun 6 01:01:49 2014 +0300 Committer: Aleksey Yeschenko <[email protected]> Committed: Fri Jun 6 01:01:49 2014 +0300 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../cassandra/db/HintedHandOffManager.java | 19 +++++++++---------- 2 files changed, 10 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0d815af6/CHANGES.txt ----------------------------------------------------------------------
