From: Rob Daugherty <rd472p@att.com>
Date: Tue, 23 Oct 2018 18:08:57 +0000 (-0400)
Subject: 8/23: merge casablanca to master
X-Git-Tag: 1.4.1~500^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=6cf9ff1f1f2360a406f68f3147d86fd864d31910;p=so.git

8/23: merge casablanca to master

Change-Id: I0a73fbedf8c6f22e0a37cd8f0505ddcf83250341
Issue-ID: SO-1160
Signed-off-by: Rob Daugherty <rd472p@att.com>
---

6cf9ff1f1f2360a406f68f3147d86fd864d31910