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/8c0aa992 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8c0aa992 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8c0aa992 Branch: refs/heads/trunk Commit: 8c0aa99279418a2f2e22f6fb7da224e7db5d22a2 Parents: cbb3c8f 3f00662 Author: Aleksey Yeschenko <alek...@apache.org> Authored: Fri Apr 11 21:03:53 2014 +0300 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Fri Apr 11 21:03:53 2014 +0300 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/db/BatchlogManager.java | 2 +- src/java/org/apache/cassandra/service/StorageService.java | 3 +++ 3 files changed, 5 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8c0aa992/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8c0aa992/src/java/org/apache/cassandra/service/StorageService.java ----------------------------------------------------------------------
