cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From marc...@apache.org
Subject [5/5] cassandra git commit: Merge branch 'cassandra-3.0' into trunk
Date Mon, 17 Aug 2015 06:56:40 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/6ae27a32
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6ae27a32
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6ae27a32

Branch: refs/heads/trunk
Commit: 6ae27a320b79cd41c010d92b1656b6ae3b7a134f
Parents: c41412a 136e700
Author: Marcus Eriksson <marcuse@apache.org>
Authored: Mon Aug 17 08:50:49 2015 +0200
Committer: Marcus Eriksson <marcuse@apache.org>
Committed: Mon Aug 17 08:50:49 2015 +0200

----------------------------------------------------------------------
 CHANGES.txt                                     |  1 +
 .../apache/cassandra/db/ColumnFamilyStore.java  | 48 +++++++++++++++++---
 .../DateTieredCompactionStrategy.java           | 13 +++++-
 .../DateTieredCompactionStrategyTest.java       |  1 +
 4 files changed, 54 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


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

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


Mime
View raw message