cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject [8/8] cassandra git commit: Merge branch 'cassandra-3.0' into trunk
Date Wed, 19 Aug 2015 01:16:59 GMT
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/036f6b77
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/036f6b77
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/036f6b77

Branch: refs/heads/trunk
Commit: 036f6b77de1613508ca4e622ac4f27196f0ecec3
Parents: 9f54e8f d12d2d4
Author: Jonathan Ellis <jbellis@apache.org>
Authored: Tue Aug 18 20:16:43 2015 -0500
Committer: Jonathan Ellis <jbellis@apache.org>
Committed: Tue Aug 18 20:16:43 2015 -0500

----------------------------------------------------------------------
 .../cassandra/db/commitlog/CommitLog.java       |   4 +-
 .../db/commitlog/CommitLogReplayer.java         | 117 +++-
 .../db/commitlog/CommitLogSegmentManager.java   |   8 +-
 .../CommitLog-5-1438186885380.log               | Bin 0 -> 839051 bytes
 .../legacy-commitlog/2.2-lz4-bitrot/hash.txt    |   6 +
 .../CommitLog-5-1438186885380.log               | Bin 0 -> 839051 bytes
 .../legacy-commitlog/2.2-lz4-bitrot2/hash.txt   |   6 +
 .../CommitLog-5-1438186885380.log               | Bin 0 -> 839001 bytes
 .../legacy-commitlog/2.2-lz4-truncated/hash.txt |   5 +
 .../db/CommitLogFailurePolicyTest.java          | 141 -----
 .../org/apache/cassandra/db/CommitLogTest.java  | 467 ---------------
 .../commitlog/CommitLogFailurePolicyTest.java   | 141 +++++
 .../cassandra/db/commitlog/CommitLogTest.java   | 578 +++++++++++++++++++
 .../db/commitlog/CommitLogUpgradeTest.java      |  65 +++
 14 files changed, 899 insertions(+), 639 deletions(-)
----------------------------------------------------------------------



Mime
View raw message