Merge branch 'cassandra-1.2' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c609f27c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c609f27c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c609f27c Branch: refs/heads/trunk Commit: c609f27cd33eb78d29255424954da7f32b204230 Parents: f3b42d2 dac6992 Author: Jonathan Ellis <jbel...@apache.org> Authored: Tue May 21 14:18:54 2013 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Tue May 21 14:18:54 2013 -0500 ---------------------------------------------------------------------- .../commitlog/BatchCommitLogExecutorService.java | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c609f27c/src/java/org/apache/cassandra/db/commitlog/BatchCommitLogExecutorService.java ----------------------------------------------------------------------
