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)
commitc5a0a09d01a176b31beb6007211fdea18b851460
tree7ce6563c579fbde952c9de5c34987d044657c593
parentc432f86329cd6caa0e26dbe8a2752b3be2aefd48
parenta1b9282ec61586005bf4921e213e3e0ff4e36866
Merge changes I36641bbb,Ia8568265

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