Merge branch 'cassandra-1.2' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0c5f05bd Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0c5f05bd Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0c5f05bd Branch: refs/heads/trunk Commit: 0c5f05bd966edfdfdb78baa31dd57e1a90488227 Parents: 20f1b81 7e057f5 Author: Aleksey Yeschenko <alek...@apache.org> Authored: Tue Oct 22 00:27:56 2013 +0800 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Tue Oct 22 00:27:56 2013 +0800 ---------------------------------------------------------------------- src/java/org/apache/cassandra/db/BatchlogManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0c5f05bd/src/java/org/apache/cassandra/db/BatchlogManager.java ----------------------------------------------------------------------
