Merge "Avoid the ValueError exception for a ping timeout."
authorqi liang <liangqi1@huawei.com>
Tue, 3 Nov 2015 02:49:57 +0000 (02:49 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Tue, 3 Nov 2015 02:49:57 +0000 (02:49 +0000)

Trivial merge