From: Jun Li <lijun_1203@126.com>
Date: Tue, 29 Aug 2017 02:04:18 +0000 (+0000)
Subject: Merge "Fetch admin.conf from master on kubernetes scenario"
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=5034e8cd06f9842c7683295eb280a7c82d1756a2;p=releng.git

Merge "Fetch admin.conf from master on kubernetes scenario"
---

5034e8cd06f9842c7683295eb280a7c82d1756a2