From: Ruijing Guo <ruijing.guo@intel.com>
Date: Thu, 11 Jan 2018 06:47:14 +0000 (+0000)
Subject: Merge "update onap branch"
X-Git-Tag: opnfv-6.0.0~33
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=687d4ba8b99ef6d8d987ed42660c8b3080be7008;p=container4nfv.git

Merge "update onap branch"
---

687d4ba8b99ef6d8d987ed42660c8b3080be7008