Merge "Fix timeout for socket connection" into stable/euphrates
authorJose Lausuch <jalausuch@suse.com>
Tue, 3 Oct 2017 06:37:04 +0000 (06:37 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Tue, 3 Oct 2017 06:37:04 +0000 (06:37 +0000)

Trivial merge