From: Marco Platania <platania@research.att.com>
Date: Wed, 15 Nov 2017 21:49:51 +0000 (+0000)
Subject: Merge "Update to final Policy docker"
X-Git-Tag: 1.0.0-Amsterdam~20
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=f03589d69bd281469681637ead2dca503c575f98;hp=-c;p=demo.git

Merge "Update to final Policy docker"
---

f03589d69bd281469681637ead2dca503c575f98
diff --combined heat/ONAP/onap_openstack.env
index f0f74117,03e95e23..c505690f
--- a/heat/ONAP/onap_openstack.env
+++ b/heat/ONAP/onap_openstack.env
@@@ -121,8 -121,8 +121,8 @@@ parameters
    policy_branch: master
    portal_branch: release-1.3.0
    robot_branch: master
 -  sdc_branch: release-1.1.0
 -  sdnc_branch: release-1.1.0
 +  sdc_branch: master
 +  sdnc_branch: master
    vid_branch: master
    clamp_branch: master
    vnfsdk_branch: master
@@@ -132,7 -132,7 +132,7 @@@
    appc_docker: 1.1-STAGING-latest
    so_docker: v1.1.0
    dcae_docker: v1.1.0
-   policy_docker: v1.1.0
+   policy_docker: v1.1.1
    portal_docker: v1.3.0
    robot_docker: 1.1-STAGING-latest
    sdc_docker: 1.1-STAGING-latest