Merge "Adjust timeouts in Vnfs"
authorJose Lausuch <jalausuch@suse.com>
Thu, 30 Nov 2017 14:31:11 +0000 (14:31 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Thu, 30 Nov 2017 14:31:11 +0000 (14:31 +0000)

Trivial merge