From: rui hu <hu.rui2@zte.com.cn>
Date: Sat, 2 Sep 2017 06:40:48 +0000 (+0000)
Subject: Merge changes I36641bbb,Ia8568265
X-Git-Tag: 2.0.0-ONAP~697
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=79134e2bb47f3d53447ffe88f92dff80de524be4;p=oom.git

Merge changes I36641bbb,Ia8568265

* changes:
  parameterize docker image
  add service endpoint annotation for aai
---

79134e2bb47f3d53447ffe88f92dff80de524be4