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/15269be3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/15269be3 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/15269be3 Branch: refs/heads/cassandra-1.1 Commit: 15269be394cc37c112c9242c9c6ae8945a03f97b Parents: edd97d4 94860c6 Author: Jonathan Ellis <[email protected]> Authored: Thu Feb 16 09:26:54 2012 -0600 Committer: Jonathan Ellis <[email protected]> Committed: Thu Feb 16 09:26:54 2012 -0600 ---------------------------------------------------------------------- CHANGES.txt | 7 ++++++- .../db/compaction/CompactionController.java | 8 ++++++++ .../org/apache/cassandra/dht/RangeStreamer.java | 1 + .../io/sstable/SSTableSimpleWriterTest.java | 3 ++- 4 files changed, 17 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
