You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ja...@apache.org on 2016/08/12 15:30:33 UTC

[8/8] cassandra git commit: Merge branch 'cassandra-3.9' into trunk

Merge branch 'cassandra-3.9' into trunk


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/060941cc
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/060941cc
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/060941cc

Branch: refs/heads/trunk
Commit: 060941cc28b92edb7ece86ef8efa5e12eb6ac58f
Parents: 69eca54 ca556c4
Author: T Jake Luciani <ja...@apache.org>
Authored: Fri Aug 12 11:29:54 2016 -0400
Committer: T Jake Luciani <ja...@apache.org>
Committed: Fri Aug 12 11:29:54 2016 -0400

----------------------------------------------------------------------
 CHANGES.txt                                     |  1 +
 .../apache/cassandra/db/ColumnFamilyStore.java  | 22 +++++------
 .../cassandra/db/commitlog/CommitLog.java       |  5 ++-
 .../db/commitlog/CommitLogSegment.java          |  5 ++-
 .../db/commitlog/CommitLogCQLTest.java          | 41 ++++++++++++++++++++
 5 files changed, 58 insertions(+), 16 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/060941cc/CHANGES.txt
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/060941cc/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/060941cc/src/java/org/apache/cassandra/db/commitlog/CommitLog.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/060941cc/src/java/org/apache/cassandra/db/commitlog/CommitLogSegment.java
----------------------------------------------------------------------