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: 4.0.0-ONAP~15^2~208
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=c5a0a09d01a176b31beb6007211fdea18b851460;p=aai%2Foom.git

Merge changes I36641bbb,Ia8568265

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

c5a0a09d01a176b31beb6007211fdea18b851460