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/b25ae0f9 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b25ae0f9 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b25ae0f9 Branch: refs/heads/trunk Commit: b25ae0f921a7366ce44751867f600c8bce4d287b Parents: a9b93c2 c4d3a31 Author: Jonathan Ellis <[email protected]> Authored: Fri Dec 13 02:30:58 2013 +0600 Committer: Jonathan Ellis <[email protected]> Committed: Fri Dec 13 02:30:58 2013 +0600 ---------------------------------------------------------------------- src/java/org/apache/cassandra/net/CallbackInfo.java | 9 +++++++++ src/java/org/apache/cassandra/net/MessagingService.java | 4 ++-- 2 files changed, 11 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b25ae0f9/src/java/org/apache/cassandra/net/MessagingService.java ----------------------------------------------------------------------
