Updated Branches: refs/heads/cassandra-1.1 4d2e5e73b -> e1491f3f2 refs/heads/trunk 18acbef13 -> 771005e99
Merge branch 'cassandra-1.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/771005e9 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/771005e9 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/771005e9 Branch: refs/heads/trunk Commit: 771005e99872e8a312954d4182c03c3c17b9c2e1 Parents: 18acbef e1491f3 Author: Yuki Morishita <yu...@apache.org> Authored: Tue Oct 16 09:40:27 2012 -0500 Committer: Yuki Morishita <yu...@apache.org> Committed: Tue Oct 16 09:40:27 2012 -0500 ---------------------------------------------------------------------- .../db/compaction/LeveledCompactionStrategy.java | 4 +++- .../compaction/LeveledCompactionStrategyTest.java | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/771005e9/src/java/org/apache/cassandra/db/compaction/LeveledCompactionStrategy.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/771005e9/test/unit/org/apache/cassandra/db/compaction/LeveledCompactionStrategyTest.java ----------------------------------------------------------------------
