Merge "[odl-sfc] Fix wait_for_vnf returning vnf_id on timeout"
authorJose Lausuch <jose.lausuch@ericsson.com>
Thu, 23 Feb 2017 10:04:21 +0000 (10:04 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Thu, 23 Feb 2017 10:04:21 +0000 (10:04 +0000)

Trivial merge