You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@cassandra.apache.org by jb...@apache.org on 2013/10/29 21:41:35 UTC

[06/11] git commit: Merge branch 'cassandra-2.0' into trunk

Merge branch 'cassandra-2.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/4f0bc89c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4f0bc89c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4f0bc89c

Branch: refs/heads/trunk
Commit: 4f0bc89cf48819c4891d6bf253b1e6e66cfdca3b
Parents: ecea057 eb6e4d0
Author: Jonathan Ellis <jb...@apache.org>
Authored: Tue Oct 29 15:39:52 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Tue Oct 29 15:39:52 2013 -0500

----------------------------------------------------------------------
 .../compaction/SizeTieredCompactionStrategyOptions.java | 10 +++++-----
 .../db/compaction/SizeTieredCompactionStrategyTest.java | 12 ++++++------
 2 files changed, 11 insertions(+), 11 deletions(-)
----------------------------------------------------------------------