Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cf0c61b8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cf0c61b8 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cf0c61b8 Branch: refs/heads/trunk Commit: cf0c61b8eb162651c6f6120cd528348550b3f258 Parents: 6977521 0bfa26d Author: Robert Stupp <sn...@snazy.de> Authored: Mon Oct 19 14:56:59 2015 +0200 Committer: Robert Stupp <sn...@snazy.de> Committed: Mon Oct 19 14:56:59 2015 +0200 ---------------------------------------------------------------------- .../apache/cassandra/net/MessagingService.java | 24 +++++++++++++++----- 1 file changed, 18 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/cf0c61b8/src/java/org/apache/cassandra/net/MessagingService.java ----------------------------------------------------------------------
