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/0ebfa3fb Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0ebfa3fb Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0ebfa3fb Branch: refs/heads/trunk Commit: 0ebfa3fbbe8cda0e2b91086466e29771303c9020 Parents: 38758c3 83a43f1 Author: Dave Brosius <[email protected]> Authored: Sat Aug 31 21:33:57 2013 -0400 Committer: Dave Brosius <[email protected]> Committed: Sat Aug 31 21:33:57 2013 -0400 ---------------------------------------------------------------------- .../db/compaction/LongCompactionsTest.java | 2 +- .../apache/cassandra/utils/LongBitSetTest.java | 2 +- .../apache/cassandra/cache/ObjectSizeTest.java | 3 +-- .../cassandra/db/ColumnFamilyStoreTest.java | 3 +-- .../org/apache/cassandra/db/CommitLogTest.java | 17 ++++++------- .../apache/cassandra/db/HintedHandOffTest.java | 2 +- .../org/apache/cassandra/db/KeyCacheTest.java | 4 ++-- .../org/apache/cassandra/db/KeyspaceTest.java | 13 ++++------ .../org/apache/cassandra/db/NameSortTest.java | 11 ++++----- .../cassandra/db/RemoveColumnFamilyTest.java | 7 ++---- .../db/RemoveColumnFamilyWithFlush1Test.java | 7 ++---- .../db/RemoveColumnFamilyWithFlush2Test.java | 7 ++---- .../apache/cassandra/db/RemoveColumnTest.java | 7 ++---- .../cassandra/db/RemoveSubColumnTest.java | 6 ++--- .../apache/cassandra/db/RowIterationTest.java | 2 +- test/unit/org/apache/cassandra/db/RowTest.java | 2 +- .../compaction/BlacklistingCompactionsTest.java | 4 ++-- .../db/compaction/CompactionsPurgeTest.java | 4 ++-- .../db/compaction/CompactionsTest.java | 2 +- .../db/compaction/OneCompactionTest.java | 2 +- .../db/index/PerRowSecondaryIndexTest.java | 4 ++-- .../cassandra/dht/PartitionerTestCase.java | 4 ++-- .../cassandra/io/LazilyCompactedRowTest.java | 17 +++++++------ .../cassandra/io/sstable/IndexHelperTest.java | 2 +- .../cassandra/io/sstable/IndexSummaryTest.java | 2 +- .../cassandra/io/sstable/SSTableLoaderTest.java | 2 +- .../io/sstable/SSTableScannerTest.java | 2 +- .../apache/cassandra/locator/EC2SnitchTest.java | 2 +- .../locator/NetworkTopologyStrategyTest.java | 2 +- .../apache/cassandra/repair/ValidatorTest.java | 5 ++-- .../cassandra/service/QueryPagerTest.java | 3 +-- .../cassandra/service/RowResolverTest.java | 2 +- .../streaming/StreamingTransferTest.java | 4 ++-- .../cassandra/tools/SSTableExportTest.java | 25 ++++++++++---------- .../cassandra/tools/SSTableImportTest.java | 6 ++--- .../org/apache/cassandra/utils/BitSetTest.java | 4 ++-- .../apache/cassandra/utils/BloomFilterTest.java | 3 +-- .../cassandra/utils/IntervalTreeTest.java | 5 ++-- .../cassandra/utils/StreamingHistogramTest.java | 2 +- 39 files changed, 89 insertions(+), 114 deletions(-) ----------------------------------------------------------------------
