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/e1002881 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e1002881 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e1002881 Branch: refs/heads/trunk Commit: e100288123b055021d9b8873ab86f0dbf5fc9f22 Parents: 4d06917 66af6fe Author: Aleksey Yeschenko <[email protected]> Authored: Fri Apr 18 03:16:14 2014 +0300 Committer: Aleksey Yeschenko <[email protected]> Committed: Fri Apr 18 03:16:14 2014 +0300 ---------------------------------------------------------------------- CHANGES.txt | 1 + NEWS.txt | 11 +- .../apache/cassandra/db/BatchlogManager.java | 102 +++++++++++-------- .../apache/cassandra/db/ColumnFamilyStore.java | 6 -- .../cassandra/db/HintedHandOffManager.java | 19 +--- .../org/apache/cassandra/db/SystemKeyspace.java | 55 +++++++--- .../db/commitlog/CommitLogReplayer.java | 12 +-- .../apache/cassandra/service/StorageProxy.java | 9 +- .../cassandra/db/BatchlogManagerTest.java | 84 +++++++++++++-- .../apache/cassandra/db/HintedHandOffTest.java | 19 ++-- 10 files changed, 214 insertions(+), 104 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e1002881/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e1002881/NEWS.txt ----------------------------------------------------------------------
