[3/4] git commit: Fix pessimistic unit tests post-4671

2013-02-20 Thread slebresne
Fix pessimistic unit tests post-4671 Conflicts: test/unit/org/apache/cassandra/db/compaction/CompactionsPurgeTest.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/068b53dd Tree: http://git-wip-us.apache.or

git commit: Fix pessimistic unit tests post-4671

2013-02-20 Thread slebresne
Updated Branches: refs/heads/cassandra-1.2 9bea226fb -> 068b53dd5 Fix pessimistic unit tests post-4671 Conflicts: test/unit/org/apache/cassandra/db/compaction/CompactionsPurgeTest.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org

git commit: Fix pessimistic unit tests post-4671

2013-02-15 Thread slebresne
Updated Branches: refs/heads/trunk 876d313f4 -> 7bc8b02c8 Fix pessimistic unit tests post-4671 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7bc8b02c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7b