Merge pull request #2438 from colindickson/master
authorCory Benfield <lukasaoz@gmail.com>
Wed, 4 Feb 2015 07:01:10 +0000 (07:01 +0000)
committerCory Benfield <lukasaoz@gmail.com>
Wed, 4 Feb 2015 07:01:10 +0000 (07:01 +0000)
add a timeout value to connection_error_invalid_port test to accelerate failure


Trivial merge