cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alek...@apache.org
Subject [5/5] git commit: Merge branch 'cassandra-2.1' into trunk
Date Tue, 22 Apr 2014 16:50:34 GMT
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/97dcba60
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/97dcba60
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/97dcba60

Branch: refs/heads/trunk
Commit: 97dcba60199eeb5df94718bb808f8be5a8cbc016
Parents: f9fb533 5045d3e
Author: Aleksey Yeschenko <aleksey@apache.org>
Authored: Tue Apr 22 19:50:16 2014 +0300
Committer: Aleksey Yeschenko <aleksey@apache.org>
Committed: Tue Apr 22 19:50:16 2014 +0300

----------------------------------------------------------------------
 CHANGES.txt                                     |  1 +
 .../apache/cassandra/db/BatchlogManager.java    |  2 +-
 .../cassandra/db/HintedHandOffManager.java      |  4 +--
 .../apache/cassandra/net/MessagingService.java  | 27 ++++++++++++++------
 .../apache/cassandra/net/WriteCallbackInfo.java | 16 +++++++++---
 .../apache/cassandra/service/StorageProxy.java  |  7 ++++-
 6 files changed, 41 insertions(+), 16 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/97dcba60/CHANGES.txt
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/97dcba60/src/java/org/apache/cassandra/net/MessagingService.java
----------------------------------------------------------------------


Mime
View raw message