From: Gary Wu <gary.i.wu@huawei.com>
Date: Wed, 6 Jun 2018 14:02:10 +0000 (+0000)
Subject: Merge "Change release version"
X-Git-Tag: v1.2.1~11
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=1ddd3c58a74617ed1937611296fc58a37a7a93e9;hp=-c;p=demo.git

Merge "Change release version"
---

1ddd3c58a74617ed1937611296fc58a37a7a93e9
diff --combined heat/ONAP/onap_openstack.env
index 4a72927a,59a9bae7..5243429f
--- a/heat/ONAP/onap_openstack.env
+++ b/heat/ONAP/onap_openstack.env
@@@ -127,17 -127,17 +127,17 @@@ parameters
    appc_docker: 1.3.0
    so_docker: 1.2.2
    policy_docker: 1.2.3
 -  portal_docker: v2.2.0
 +  portal_docker: 2.2.0
    robot_docker: 1.2.1
    sdc_docker: 1.2.0
    sdnc_docker: 1.3.4
    vid_docker: 2.0.0
    clamp_docker: 2.0.2
    msb_docker: 1.1.0
-   mvim_docker: 1.1.2-STAGING
-   mvim_openstack_docker: 1.1.2-SNAPSHOT
+   mvim_docker: 1.1.2
+   mvim_openstack_docker: 1.1.2
    uui_docker: latest
 -  esr_docker: latest
 +  esr_docker: 1.1.0
    sdc_wfd_docker: 1.1.0
    dgbuilder_docker: 0.2.4
    cli_docker: 2.0.2
@@@ -162,6 -162,8 +162,6 @@@
    dcae_inv_docker: 3.0.1
    dcae_ph_docker: 2.4.5
    dcae_sch_docker: 1.1.4
 -  dcae_heartbeat_docker: latest
 -  dcae_prh_docker: latest
    holmes_rm_docker: 1.1.0
    holmes_em_docker: 1.1.0