Merge branch 'cassandra-3.X' into trunk

Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4f8a1c89
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4f8a1c89
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4f8a1c89

Branch: refs/heads/trunk
Commit: 4f8a1c89b58bbd0fde9f2338c05ec1917b5e9ebc
Parents: 65405b9 26ee16b
Author: Yuki Morishita <yu...@apache.org>
Authored: Thu Oct 20 10:41:00 2016 -0500
Committer: Yuki Morishita <yu...@apache.org>
Committed: Thu Oct 20 10:41:00 2016 -0500

----------------------------------------------------------------------
 .../apache/cassandra/streaming/DefaultConnectionFactory.java   | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)
----------------------------------------------------------------------


Reply via email to