From: Zhijiang Hu <hu.zhijiang@zte.com.cn>
Date: Fri, 5 Jan 2018 06:28:53 +0000 (+0000)
Subject: Merge "Get configurations from pharos instead securedlab"
X-Git-Tag: opnfv-6.0.0~26
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=49205e7200afd0ce286d2f685093948cb1f7bf3d;p=daisy.git

Merge "Get configurations from pharos instead securedlab"
---

49205e7200afd0ce286d2f685093948cb1f7bf3d