Merge "[odl-sfc] Add timeout to get_vnf_id and create_vnf functions"
authorJose Lausuch <jose.lausuch@ericsson.com>
Mon, 20 Feb 2017 12:08:21 +0000 (12:08 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Mon, 20 Feb 2017 12:08:21 +0000 (12:08 +0000)

Trivial merge