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/21b7bbe6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/21b7bbe6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/21b7bbe6 Branch: refs/heads/trunk Commit: 21b7bbe6a92eb0e05a96f4f19b32a307d2d57808 Parents: a812998 3d2decf Author: Yuki Morishita <[email protected]> Authored: Tue Oct 9 10:54:49 2012 -0500 Committer: Yuki Morishita <[email protected]> Committed: Tue Oct 9 10:54:49 2012 -0500 ---------------------------------------------------------------------- .../compaction/LeveledCompactionStrategyTest.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/21b7bbe6/test/unit/org/apache/cassandra/db/compaction/LeveledCompactionStrategyTest.java ----------------------------------------------------------------------
