Merge branch 'cassandra-3.0' into cassandra-3.X

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

Branch: refs/heads/cassandra-3.X
Commit: 26ee16b5f7f829285cf19ea067a4c534c97ca87a
Parents: af1afef 4ba91cd
Author: Yuki Morishita <yu...@apache.org>
Authored: Thu Oct 20 10:38:59 2016 -0500
Committer: Yuki Morishita <yu...@apache.org>
Committed: Thu Oct 20 10:38:59 2016 -0500

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


Reply via email to