From: Tao Shen <shentao@chinamobile.com>
Date: Fri, 17 Mar 2017 03:59:13 +0000 (+0000)
Subject: Merge "Resolve the merge conflict"
X-Git-Tag: release/mercury~89
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=71f65aab9d72cbd3a015bb2467a254bf542bf38d;p=vnfsdk%2Frefrepo.git

Merge "Resolve the merge conflict"
---

71f65aab9d72cbd3a015bb2467a254bf542bf38d