From: Marcus Williams <marcus.williams@intel.com>
Date: Fri, 10 Nov 2017 22:03:23 +0000 (+0000)
Subject: Merge "Update dmaap config"
X-Git-Tag: v1.2.1~15
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=sdnc%2Foam.git;a=commitdiff_plain;h=aac15baf7fe9b69f70931d0ed076395e19779cf7

Merge "Update dmaap config"

Former-commit-id: 5f99b3dfbc600ce33f6ffa41eab41bd2f5681682
---

aac15baf7fe9b69f70931d0ed076395e19779cf7