You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by bl...@apache.org on 2016/06/02 10:53:01 UTC
[4/4] cassandra git commit: Merge branch cassandra-3.7 into trunk
Merge branch cassandra-3.7 into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/adfbf518
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/adfbf518
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/adfbf518
Branch: refs/heads/trunk
Commit: adfbf518e041595a481cd902a033e6b081f50f82
Parents: eb5a59a dc6ffc2
Author: Benjamin Lerer <b....@gmail.com>
Authored: Thu Jun 2 12:51:58 2016 +0200
Committer: Benjamin Lerer <b....@gmail.com>
Committed: Thu Jun 2 12:52:10 2016 +0200
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../cassandra/db/commitlog/CommitLog.java | 102 +++++++++-
.../db/commitlog/CommitLogSegment.java | 15 +-
.../db/commitlog/CommitLogSegmentManager.java | 17 +-
.../db/commitlog/CompressedSegment.java | 4 +-
.../db/commitlog/EncryptedSegment.java | 4 +-
.../db/commitlog/CommitLogStressTest.java | 12 +-
.../db/RecoveryManagerFlushedTest.java | 40 ++++
.../db/RecoveryManagerMissingHeaderTest.java | 38 +++-
.../cassandra/db/RecoveryManagerTest.java | 167 ++++++++++-------
.../db/RecoveryManagerTruncateTest.java | 38 ++++
.../db/commitlog/CommitLogDescriptorTest.java | 3 +-
.../cassandra/db/commitlog/CommitLogTest.java | 187 ++++++-------------
.../db/commitlog/CommitLogUpgradeTestMaker.java | 4 +-
14 files changed, 407 insertions(+), 225 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/adfbf518/CHANGES.txt
----------------------------------------------------------------------