Merge changes from topic 'fix-amsterdam' into release-1.1.0
authorMike Elliott <mike.elliott@amdocs.com>
Fri, 1 Dec 2017 15:59:54 +0000 (15:59 +0000)
committerGerrit Code Review <gerrit@onap.org>
Fri, 1 Dec 2017 15:59:54 +0000 (15:59 +0000)
commitfc78a5e0d84612a2e9850ace315249bd272fc8eb
treeefc256c52f979e7992d33de66757681348c0993f
parent75038ebbfcee9a2bc6b987ab78d7209c6c151a81
parent27db46de65bf954a04b6c35fa811069c547e0930
Merge changes from topic 'fix-amsterdam' into release-1.1.0

* changes:
  Fix ONAP entity-event-policy.xml bean package
  Fix docker image name for AAI
  Output the Robot logs at the proper place