Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5b68b2dd Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5b68b2dd Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5b68b2dd Branch: refs/heads/cassandra-2.2 Commit: 5b68b2dddf13d17c7c8e097e856c1db68037d3b9 Parents: 39c7869 4d1b8b4 Author: Tyler Hobbs <tylerlho...@gmail.com> Authored: Fri Aug 7 11:44:54 2015 -0500 Committer: Tyler Hobbs <tylerlho...@gmail.com> Committed: Fri Aug 7 11:44:54 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/5b68b2dd/src/java/org/apache/cassandra/net/MessagingService.java ----------------------------------------------------------------------
