From: Marco Platania <platania@research.att.com>
Date: Wed, 15 Nov 2017 22:11:28 +0000 (+0000)
Subject: Merge "Align Docker versions with manifest file"
X-Git-Tag: 1.0.0-Amsterdam~19
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=demo.git;a=commitdiff_plain;h=c20294d9fda0fbe11cce7119f56c4e5d4bd49318

Merge "Align Docker versions with manifest file"
---

c20294d9fda0fbe11cce7119f56c4e5d4bd49318
diff --cc heat/ONAP/onap_openstack.env
index c505690f,0cf5c028..36f787dc
--- a/heat/ONAP/onap_openstack.env
+++ b/heat/ONAP/onap_openstack.env
@@@ -129,10 -129,10 +129,10 @@@ parameters
  
    aai_docker: v1.1.0
    aai_sparky_docker: v1.0.0
-   appc_docker: 1.1-STAGING-latest
+   appc_docker: 1.2.0
    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