From: Mike Elliott Date: Fri, 1 Dec 2017 15:59:54 +0000 (+0000) Subject: Merge changes from topic 'fix-amsterdam' into release-1.1.0 X-Git-Url: https://gerrit.onap.org/r/gitweb?p=oom.git;a=commitdiff_plain;h=fc78a5e0d84612a2e9850ace315249bd272fc8eb 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 --- fc78a5e0d84612a2e9850ace315249bd272fc8eb