From: Gary Wu <gary.i.wu@huawei.com>
Date: Wed, 6 Jun 2018 14:00:17 +0000 (+0000)
Subject: Merge "Update the docker manifest file and artifacts" into beijing
X-Git-Tag: v2.0.0~8
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=ad8b3c85cdb63f1acd757c93dc53a1b02b7af02d;p=integration.git

Merge "Update the docker manifest file and artifacts" into beijing
---

ad8b3c85cdb63f1acd757c93dc53a1b02b7af02d
diff --cc version-manifest/src/main/resources/docker-manifest.csv
index 6ed006c4c,259dd9f19..de1c0059d
--- 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