Merge "load ONAP TOSCA into controller"
authorAlexis de Talhouët <alexis.de_talhouet@bell.ca>
Wed, 19 Sep 2018 15:40:31 +0000 (15:40 +0000)
committerGerrit Code Review <gerrit@onap.org>
Wed, 19 Sep 2018 15:40:31 +0000 (15:40 +0000)

Trivial merge