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