From: Marcus Williams <marcus.williams@intel.com>
Date: Wed, 30 May 2018 19:01:02 +0000 (+0000)
Subject: Merge "Correct controllerType property name"
X-Git-Tag: v1.2.1~16
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=8d0736631972c7e36933d1f3f2a86d2e5f7dc3aa;p=so.git

Merge "Correct controllerType property name"
---

8d0736631972c7e36933d1f3f2a86d2e5f7dc3aa