Merge "Add mso-asdc-controller-config to mso-docker.json"
authorRob Daugherty <rd472p@att.com>
Fri, 13 Apr 2018 17:16:15 +0000 (17:16 +0000)
committerGerrit Code Review <gerrit@onap.org>
Fri, 13 Apr 2018 17:16:15 +0000 (17:16 +0000)

Trivial merge