Merge branch 'cassandra-3.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f207869e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f207869e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f207869e Branch: refs/heads/trunk Commit: f207869ed164c40a16a22ec0b91ed04e54a67877 Parents: cd959b0 a8b8515 Author: Tyler Hobbs <[email protected]> Authored: Fri Aug 7 11:45:42 2015 -0500 Committer: Tyler Hobbs <[email protected]> Committed: Fri Aug 7 11:45:42 2015 -0500 ---------------------------------------------------------------------- src/java/org/apache/cassandra/net/MessagingService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ----------------------------------------------------------------------
