From: Mandeep Khinda <Mandeep.Khinda@amdocs.com>
Date: Fri, 14 Sep 2018 20:05:37 +0000 (+0000)
Subject: Merge "Adding AAF configuration"
X-Git-Tag: 4.0.0-ONAP~15^2~100
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=f55c86d5118943f9b25ddc2501ab7beb770dba0e;p=aai%2Foom.git

Merge "Adding AAF configuration"
---

f55c86d5118943f9b25ddc2501ab7beb770dba0e