cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brandonwilli...@apache.org
Subject [3/7] git commit: Merge branch 'cassandra-1.1.0' into cassandra-1.1
Date Tue, 27 Mar 2012 20:04:22 GMT
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/42a0a46a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/42a0a46a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/42a0a46a

Branch: refs/heads/trunk
Commit: 42a0a46a85a7e46681177273eacc9bbb1fa17cc0
Parents: 8ac731e 3ee8682
Author: Brandon Williams <brandonwilliams@apache.org>
Authored: Tue Mar 27 15:04:06 2012 -0500
Committer: Brandon Williams <brandonwilliams@apache.org>
Committed: Tue Mar 27 15:04:06 2012 -0500

----------------------------------------------------------------------
 src/java/org/apache/cassandra/config/Config.java   |    2 +
 .../cassandra/config/DatabaseDescriptor.java       |    7 +-
 .../org/apache/cassandra/dht/RangeStreamer.java    |    7 +-
 .../apache/cassandra/io/sstable/SSTableLoader.java |    6 +-
 .../apache/cassandra/service/StorageService.java   |   17 ++-
 .../cassandra/streaming/AbstractStreamSession.java |  112 +++++++++++++++
 .../cassandra/streaming/IStreamCallback.java       |   36 +++++
 .../org/apache/cassandra/streaming/StreamIn.java   |    4 +-
 .../cassandra/streaming/StreamInSession.java       |   68 +++++----
 .../org/apache/cassandra/streaming/StreamOut.java  |    2 +-
 .../cassandra/streaming/StreamOutSession.java      |   88 ++----------
 .../apache/cassandra/streaming/StreamReply.java    |    1 +
 .../streaming/StreamReplyVerbHandler.java          |    5 +-
 .../cassandra/streaming/StreamingRepairTask.java   |   22 ++--
 14 files changed, 244 insertions(+), 133 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/42a0a46a/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------


Mime
View raw message