Merge branch 'cassandra-2.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/cd31b185 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cd31b185 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cd31b185 Branch: refs/heads/trunk Commit: cd31b185714ddedcb3147ccf7678a9bbd66b7528 Parents: bd961f3 8a5b90e Author: Yuki Morishita <[email protected]> Authored: Tue Apr 8 21:37:40 2014 -0500 Committer: Yuki Morishita <[email protected]> Committed: Tue Apr 8 21:37:40 2014 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/cassandra/net/CallbackInfo.java | 15 ++++++++- .../net/IAsyncCallbackWithFailure.java | 29 +++++++++++++++++ .../cassandra/net/MessageDeliveryTask.java | 16 +++++++++- .../org/apache/cassandra/net/MessageIn.java | 10 ++++++ .../apache/cassandra/net/MessagingService.java | 33 +++++++++++++++----- .../cassandra/net/ResponseVerbHandler.java | 12 +++++-- .../apache/cassandra/repair/SnapshotTask.java | 21 ++++++++----- .../cassandra/service/ActiveRepairService.java | 23 +++++++++++--- .../cassandra/service/StorageService.java | 12 ++++++- 10 files changed, 146 insertions(+), 26 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/cd31b185/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/cd31b185/src/java/org/apache/cassandra/net/MessagingService.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/cd31b185/src/java/org/apache/cassandra/service/StorageService.java ----------------------------------------------------------------------
