Updated Branches: refs/heads/cassandra-1.2 7a90c7466 -> f3091835e refs/heads/trunk 1f8b9e37f -> 95ffb5d2d
Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/95ffb5d2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/95ffb5d2 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/95ffb5d2 Branch: refs/heads/trunk Commit: 95ffb5d2dd62a4902745aa0401467d7bcb6687fb Parents: 1f8b9e3 f309183 Author: Yuki Morishita <yu...@apache.org> Authored: Tue Feb 5 22:09:53 2013 -0600 Committer: Yuki Morishita <yu...@apache.org> Committed: Tue Feb 5 22:09:53 2013 -0600 ---------------------------------------------------------------------- .../cassandra/db/compaction/CompactionsTest.java | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/95ffb5d2/test/unit/org/apache/cassandra/db/compaction/CompactionsTest.java ----------------------------------------------------------------------
