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/5f02f202 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5f02f202 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5f02f202 Branch: refs/heads/trunk Commit: 5f02f202f85a6e65ded436c9471c4001d71927af Parents: ae669b0 45dd5d1 Author: Jason Brown <[email protected]> Authored: Tue Sep 1 22:23:34 2015 -0700 Committer: Jason Brown <[email protected]> Committed: Tue Sep 1 22:23:34 2015 -0700 ---------------------------------------------------------------------- src/java/org/apache/cassandra/net/MessageDeliveryTask.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ----------------------------------------------------------------------
