You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ma...@apache.org on 2014/04/01 07:45:17 UTC
[3/3] git commit: Merge branch 'cassandra-2.1' into trunk
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/5cdfa69c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5cdfa69c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5cdfa69c
Branch: refs/heads/trunk
Commit: 5cdfa69ca2c353247cbb9a885944292d0967e14b
Parents: 3b14239 26191ca
Author: Marcus Eriksson <ma...@apache.org>
Authored: Tue Apr 1 07:44:55 2014 +0200
Committer: Marcus Eriksson <ma...@apache.org>
Committed: Tue Apr 1 07:44:55 2014 +0200
----------------------------------------------------------------------
CHANGES.txt | 2 ++
.../db/compaction/AbstractCompactionStrategy.java | 2 ++
.../cassandra/db/compaction/CompactionManager.java | 2 +-
.../db/compaction/LeveledCompactionStrategy.java | 16 ++++++++++++++++
.../db/compaction/SizeTieredCompactionStrategy.java | 6 ++++++
.../apache/cassandra/db/compaction/Upgrader.java | 2 ++
6 files changed, 29 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5cdfa69c/CHANGES.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5cdfa69c/src/java/org/apache/cassandra/db/compaction/SizeTieredCompactionStrategy.java
----------------------------------------------------------------------