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)
commit79134e2bb47f3d53447ffe88f92dff80de524be4
tree0bbd475f0e05f04a41fe04a21104b61ddc42bef2
parente4fa91b5fc6f3cf77a0a7faf2abe5b472386c369
parent14391b41d1cea04544e284f502cc4da2eef69d90
Merge changes I36641bbb,Ia8568265

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