Merge branch 'cassandra-3.0' into cassandra-3.11
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1248d362 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1248d362 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1248d362 Branch: refs/heads/cassandra-3.11 Commit: 1248d3620cc13b62b26e192699fa5a874abf326f Parents: 2b62cb9 1ae8419 Author: Robert Stupp <sn...@snazy.de> Authored: Wed Mar 8 13:56:43 2017 +0100 Committer: Robert Stupp <sn...@snazy.de> Committed: Wed Mar 8 13:56:43 2017 +0100 ---------------------------------------------------------------------- .../apache/cassandra/net/MessagingService.java | 23 +++++++++++++++----- 1 file changed, 17 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1248d362/src/java/org/apache/cassandra/net/MessagingService.java ----------------------------------------------------------------------
