From: Gary Wu <gary.i.wu@huawei.com>
Date: Mon, 15 Jan 2018 18:27:36 +0000 (+0000)
Subject: Merge "Update Heat env file" into amsterdam
X-Git-Tag: 1.0.1-Amsterdam~5
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=c9e00752d8850e0e61e83e01aa011ae39b889450;hp=-c;p=demo.git

Merge "Update Heat env file" into amsterdam
---

c9e00752d8850e0e61e83e01aa011ae39b889450
diff --combined heat/ONAP/onap_openstack.env
index 00fd2d23,df46e250..95abf979
--- a/heat/ONAP/onap_openstack.env
+++ b/heat/ONAP/onap_openstack.env
@@@ -122,7 -122,7 +122,7 @@@ parameters
    policy_branch: amsterdam
    portal_branch: amsterdam
    robot_branch: amsterdam
-   sdc_branch: release-1.1.0
+   sdc_branch: amsterdam
    sdnc_branch: amsterdam
    vid_branch: amsterdam
    clamp_branch: amsterdam
@@@ -137,14 -137,14 +137,14 @@@
    portal_docker: v1.3.0
    robot_docker: 1.1-STAGING-latest
    sdc_docker: v1.1.0
 -  sdnc_docker: v1.2.1
 +  sdnc_docker: v1.2.2
    vid_docker: v1.1.1
    clamp_docker: v1.1.0
    msb_docker: 1.0.0
    mvim_docker: v1.0.0
    uui_docker: v1.0.1
    esr_docker: v1.0.0
 -  dgbuilder_docker: v0.1.0
 +  dgbuilder_docker: v0.1.1
    cli_docker: v1.1.0
  
    vfc_nokia_docker: v1.0.2