cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From marc...@apache.org
Subject [2/2] git commit: Merge branch 'cassandra-2.1' into trunk
Date Tue, 18 Mar 2014 08:48:08 GMT
Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: 5b88a0f6281668bad154e5c91accdab34d10dddb
Parents: 6e66cf5 17945ab
Author: Marcus Eriksson <marcuse@apache.org>
Authored: Tue Mar 18 09:47:50 2014 +0100
Committer: Marcus Eriksson <marcuse@apache.org>
Committed: Tue Mar 18 09:47:50 2014 +0100

----------------------------------------------------------------------
 CHANGES.txt                                     |   1 +
 .../apache/cassandra/db/ColumnFamilyStore.java  |  17 +--
 .../db/compaction/CompactionManager.java        | 105 ++++++++++++++-----
 .../SizeTieredCompactionStrategy.java           |   2 +-
 .../cassandra/service/StorageService.java       |  30 ++++--
 .../cassandra/service/StorageServiceMBean.java  |   8 +-
 .../org/apache/cassandra/tools/NodeProbe.java   |  46 ++++++--
 .../org/apache/cassandra/tools/NodeTool.java    |   6 +-
 8 files changed, 161 insertions(+), 54 deletions(-)
----------------------------------------------------------------------


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/5b88a0f6/src/java/org/apache/cassandra/db/compaction/SizeTieredCompactionStrategy.java
----------------------------------------------------------------------


Mime
View raw message