Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/70dc3202 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/70dc3202 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/70dc3202 Branch: refs/heads/trunk Commit: 70dc32023d759716c4bdcf92060e3d977a7f588b Parents: 87e19fc e7c90e0 Author: Jonathan Ellis <[email protected]> Authored: Wed Oct 2 19:09:30 2013 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Wed Oct 2 19:09:30 2013 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/cassandra/net/CallbackInfo.java | 16 +----------- .../apache/cassandra/net/MessagingService.java | 20 ++++++++------- .../apache/cassandra/net/WriteCallbackInfo.java | 26 +++++++++++++++++++ .../apache/cassandra/service/StorageProxy.java | 27 ++++++++++++++++---- 5 files changed, 61 insertions(+), 29 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/70dc3202/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/70dc3202/src/java/org/apache/cassandra/net/MessagingService.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/70dc3202/src/java/org/apache/cassandra/service/StorageProxy.java ----------------------------------------------------------------------
