Merge branch 'cassandra-2.2' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2eda224d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2eda224d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2eda224d Branch: refs/heads/trunk Commit: 2eda224d272999a4ab36010883802947e1a52c80 Parents: fa7103f 506068b Author: Robert Stupp <[email protected]> Authored: Sat Jul 18 14:07:52 2015 +0200 Committer: Robert Stupp <[email protected]> Committed: Sat Jul 18 14:07:52 2015 +0200 ---------------------------------------------------------------------- .../org/apache/cassandra/net/MessagingService.java | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2eda224d/src/java/org/apache/cassandra/net/MessagingService.java ----------------------------------------------------------------------
