Merge branch 'cassandra-3.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6292aaa7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6292aaa7 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6292aaa7 Branch: refs/heads/trunk Commit: 6292aaa729ffb7f6367b149fb84edce3613c7872 Parents: 05de664 7ea2ce1 Author: Benedict Elliott Smith <[email protected]> Authored: Sat Aug 8 12:36:36 2015 +0200 Committer: Benedict Elliott Smith <[email protected]> Committed: Sat Aug 8 12:36:36 2015 +0200 ---------------------------------------------------------------------- .../apache/cassandra/db/commitlog/AbstractCommitLogService.java | 3 ++- .../org/apache/cassandra/db/commitlog/BatchCommitLogService.java | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) ----------------------------------------------------------------------
