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/a8b8515c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a8b8515c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a8b8515c Branch: refs/heads/trunk Commit: a8b8515c84bfdb9960751567baf92804611b5cd8 Parents: 3be99ee 5b68b2d Author: Tyler Hobbs <tylerlho...@gmail.com> Authored: Fri Aug 7 11:45:22 2015 -0500 Committer: Tyler Hobbs <tylerlho...@gmail.com> Committed: Fri Aug 7 11:45:22 2015 -0500 ---------------------------------------------------------------------- src/java/org/apache/cassandra/net/MessagingService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a8b8515c/src/java/org/apache/cassandra/net/MessagingService.java ----------------------------------------------------------------------
