Merge branch 'trunk' of https://git-wip-us.apache.org/repos/asf/cassandra into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/dff6803c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/dff6803c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/dff6803c Branch: refs/heads/trunk Commit: dff6803c277c5ac1981b7148a612b6a82f6bc3b8 Parents: f75026a e19fa37 Author: Dave Brosius <[email protected]> Authored: Thu Oct 11 23:15:24 2012 -0400 Committer: Dave Brosius <[email protected]> Committed: Thu Oct 11 23:15:24 2012 -0400 ---------------------------------------------------------------------- CHANGES.txt | 4 + NEWS.txt | 5 + .../apache/cassandra/db/HintedHandOffManager.java | 68 +++++--- .../cassandra/hadoop/pig/CassandraStorage.java | 36 +++-- .../apache/cassandra/io/sstable/Descriptor.java | 7 +- .../cassandra/io/sstable/SSTableMetadata.java | 6 + .../org/apache/cassandra/service/StorageProxy.java | 22 ++- .../cassandra/service/WriteResponseHandler.java | 7 + .../LongLeveledCompactionStrategyTest.java | 129 +++++++++++++++ test/unit/org/apache/cassandra/Util.java | 5 + test/unit/org/apache/cassandra/db/TableTest.java | 38 +++++ .../compaction/LeveledCompactionStrategyTest.java | 96 ----------- 12 files changed, 274 insertions(+), 149 deletions(-) ----------------------------------------------------------------------
