Merge changes If9b61064,I0490eade into stable/gambia
authorCedric Ollivier <cedric.ollivier@orange.com>
Tue, 6 Nov 2018 13:14:19 +0000 (13:14 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Tue, 6 Nov 2018 13:14:19 +0000 (13:14 +0000)
* changes:
  Increase Vmtp timeouts
  Run vnfs in all scenarios


Trivial merge