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?a=commitdiff_plain;h=c20294d9fda0fbe11cce7119f56c4e5d4bd49318;hp=e54fcaa1de8ca25678a46cc936a5df700a0ed38a;p=demo.git

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

diff --git a/heat/ONAP/onap_openstack.env b/heat/ONAP/onap_openstack.env
index 0cf5c028..36f787dc 100644
--- a/heat/ONAP/onap_openstack.env
+++ b/heat/ONAP/onap_openstack.env
@@ -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 @@ parameters:
   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