From: Gary Wu <gary.i.wu@huawei.com>
Date: Wed, 6 Jun 2018 14:00:22 +0000 (+0000)
Subject: Merge "Change version number in docker manifest file"
X-Git-Tag: 2.0.0-ONAP~8^2~13
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=1542bfb51884a1148915b67756d9ac7f70789fcb;p=integration.git

Merge "Change version number in docker manifest file"
---

1542bfb51884a1148915b67756d9ac7f70789fcb
diff --cc version-manifest/src/main/resources/docker-manifest.csv
index c6114c657,84ce99a8b..98fd480a0
--- a/version-manifest/src/main/resources/docker-manifest.csv
+++ b/version-manifest/src/main/resources/docker-manifest.csv
@@@ -30,13 -30,14 +30,13 @@@ onap/gizmo,1.2.
  onap/holmes/engine-management,1.1.0
  onap/holmes/rule-management,1.1.0
  onap/model-loader,1.2.1
 -onap/modeling/javatoscachecker,latest
  onap/msb/msb_apigateway,1.1.0
  onap/msb/msb_discovery,1.1.0
- onap/multicloud/framework,1.1.2-STAGING
- onap/multicloud/openstack-newton,1.1.2-SNAPSHOT
- onap/multicloud/openstack-ocata,1.1.2-SNAPSHOT
- onap/multicloud/openstack-windriver,1.1.2-SNAPSHOT
- onap/multicloud/vio,1.1.2-STAGING
+ onap/multicloud/framework,1.1.2
+ onap/multicloud/openstack-newton,1.1.2
+ onap/multicloud/openstack-windriver,1.1.2
+ onap/multicloud/openstack/openstack-ocata,1.1.2
+ onap/multicloud/vio,1.1.2
  onap/multicloud/vio-vesagent,1.0.0
  onap/music/cassandra_music,3.0.0
  onap/music/music,latest