From: Marcus Williams <marcus.williams@intel.com>
Date: Wed, 24 Oct 2018 14:10:15 +0000 (+0000)
Subject: Merge "8/23: merge casablanca to master"
X-Git-Tag: 1.4.1~500
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=d0c0de2ddf2b7cfc32c2a769f79f682ebd4be772;p=so.git

Merge "8/23: merge casablanca to master"
---

d0c0de2ddf2b7cfc32c2a769f79f682ebd4be772