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/0ca6beb6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0ca6beb6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0ca6beb6 Branch: refs/heads/trunk Commit: 0ca6beb6823bcf6f31c69454da98c1f53cd88780 Parents: 543fbc3 440824c Author: Aleksey Yeschenko <alek...@apache.org> Authored: Fri Oct 17 03:40:46 2014 +0300 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Fri Oct 17 03:40:46 2014 +0300 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../apache/cassandra/db/BatchlogManager.java | 63 ++++++++++---------- .../cassandra/service/StorageService.java | 25 ++++++-- .../cassandra/db/BatchlogManagerTest.java | 8 +-- 4 files changed, 57 insertions(+), 40 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0ca6beb6/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0ca6beb6/src/java/org/apache/cassandra/service/StorageService.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0ca6beb6/test/unit/org/apache/cassandra/db/BatchlogManagerTest.java ----------------------------------------------------------------------
