Merge branch 'cassandra-1.1.0' into cassandra-1.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8909e1a9 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8909e1a9 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8909e1a9 Branch: refs/heads/cassandra-1.1 Commit: 8909e1a92bf729d7644be7777b01f5189f050c8a Parents: bf4d6fb 34c1fc0 Author: Brandon Williams <[email protected]> Authored: Wed Apr 11 15:07:48 2012 -0500 Committer: Brandon Williams <[email protected]> Committed: Wed Apr 11 15:07:48 2012 -0500 ---------------------------------------------------------------------- .../org/apache/cassandra/dht/RangeStreamer.java | 6 ++++- .../apache/cassandra/io/sstable/SSTableLoader.java | 6 ++++- .../apache/cassandra/service/StorageService.java | 19 ++++++++++++-- .../apache/cassandra/streaming/FileStreamTask.java | 7 +++++ .../cassandra/streaming/StreamInSession.java | 12 ++++++++- 5 files changed, 43 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8909e1a9/src/java/org/apache/cassandra/service/StorageService.java ----------------------------------------------------------------------
