cassandra-commits mailing list archives

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

Branch: refs/heads/trunk
Commit: a1f331f174bea96f72f551693a649dbf5242819f
Parents: ba56b82 929438b
Author: Marcus Eriksson <marcuse@apache.org>
Authored: Mon Aug 10 09:18:14 2015 +0200
Committer: Marcus Eriksson <marcuse@apache.org>
Committed: Mon Aug 10 09:18:14 2015 +0200

----------------------------------------------------------------------
 CHANGES.txt                                     |  1 +
 NEWS.txt                                        |  3 +-
 .../org/apache/cassandra/config/CFMetaData.java |  7 +-
 .../apache/cassandra/db/ColumnFamilyStore.java  | 29 ++++++-
 .../cassandra/db/ColumnFamilyStoreMBean.java    | 19 +++--
 .../compaction/CompactionStrategyManager.java   | 51 +++++++++---
 .../db/compaction/CompactionsCQLTest.java       | 81 +++++++++++++++++++-
 7 files changed, 166 insertions(+), 25 deletions(-)
----------------------------------------------------------------------



Mime
View raw message