Merge branch 'cassandra-3.11' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5ec97afc Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5ec97afc Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5ec97afc Branch: refs/heads/trunk Commit: 5ec97afce9de71eaf9b63bf6ac406aee344d860c Parents: 9d93365 1092f5e Author: Jeff Jirsa <[email protected]> Authored: Fri Mar 17 15:28:33 2017 -0700 Committer: Jeff Jirsa <[email protected]> Committed: Fri Mar 17 15:29:36 2017 -0700 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../cassandra/metrics/DroppedMessageMetrics.java | 6 +++++- .../org/apache/cassandra/net/MessagingService.java | 17 ++++++++++++++++- .../apache/cassandra/net/MessagingServiceTest.java | 3 +++ 4 files changed, 25 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5ec97afc/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5ec97afc/src/java/org/apache/cassandra/net/MessagingService.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5ec97afc/test/unit/org/apache/cassandra/net/MessagingServiceTest.java ----------------------------------------------------------------------
