Merge "Fetch admin.conf from master on kubernetes scenario"
authorJun Li <lijun_1203@126.com>
Tue, 29 Aug 2017 02:04:18 +0000 (02:04 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Tue, 29 Aug 2017 02:04:18 +0000 (02:04 +0000)

Trivial merge