Merge changes I36641bbb,Ia8568265
authorrui hu <hu.rui2@zte.com.cn>
Sat, 2 Sep 2017 06:40:48 +0000 (06:40 +0000)
committerGerrit Code Review <gerrit@onap.org>
Sat, 2 Sep 2017 06:40:48 +0000 (06:40 +0000)
* changes:
  parameterize docker image
  add service endpoint annotation for aai


Trivial merge