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 2015/04/01 13:19:18 UTC

[2/2] cassandra 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/1b0a59e2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1b0a59e2
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1b0a59e2

Branch: refs/heads/trunk
Commit: 1b0a59e2ac5c29176280649e65ff4fe82bb76281
Parents: b09e392 0ba5f27
Author: Marcus Eriksson <ma...@apache.org>
Authored: Wed Apr 1 13:14:45 2015 +0200
Committer: Marcus Eriksson <ma...@apache.org>
Committed: Wed Apr 1 13:14:45 2015 +0200

----------------------------------------------------------------------
 .../cassandra/db/compaction/DateTieredCompactionStrategy.java      | 2 +-
 .../cassandra/db/compaction/DateTieredCompactionStrategyTest.java  | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/1b0a59e2/src/java/org/apache/cassandra/db/compaction/DateTieredCompactionStrategy.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1b0a59e2/test/unit/org/apache/cassandra/db/compaction/DateTieredCompactionStrategyTest.java
----------------------------------------------------------------------