From: Yang Xu <yang.xu3@huawei.com>
Date: Sun, 18 Nov 2018 03:01:28 +0000 (+0000)
Subject: Merge "Put VID staging back to 3.2-STAGING-latest"
X-Git-Tag: 4.0.0-ONAP~344
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=8e06d4c205b396f49d1f29e97f47c9c94386f52a;hp=-c;p=integration.git

Merge "Put VID staging back to 3.2-STAGING-latest"
---

8e06d4c205b396f49d1f29e97f47c9c94386f52a
diff --combined version-manifest/src/main/resources/docker-manifest-staging.csv
index 08859eba1,4df250a68..079dc18a2
--- a/version-manifest/src/main/resources/docker-manifest-staging.csv
+++ b/version-manifest/src/main/resources/docker-manifest-staging.csv
@@@ -102,16 -102,16 +102,16 @@@ onap/portal-db,2.3.
  onap/portal-sdk,2.3.1
  onap/portal-wms,2.3.1
  onap/rproxy,2.1-STAGING-latest
 -onap/sdc-backend,1.3-STAGING-latest
 -onap/sdc-backend-init,1.3-STAGING-latest
 -onap/sdc-cassandra,1.3-STAGING-latest
 -onap/sdc-cassandra-init,1.3-STAGING-latest
 -onap/sdc-elasticsearch,1.3-STAGING-latest
 -onap/sdc-frontend,1.3-STAGING-latest
 -onap/sdc-init-elasticsearch,1.3-STAGING-latest
 -onap/sdc-kibana,1.3-STAGING-latest
 -onap/sdc-onboard-backend,1.3-STAGING-latest
 -onap/sdc-onboard-cassandra-init,1.3-STAGING-latest
 +onap/sdc-backend,1.4-STAGING-latest
 +onap/sdc-backend-init,1.4-STAGING-latest
 +onap/sdc-cassandra,1.4-STAGING-latest
 +onap/sdc-cassandra-init,1.4-STAGING-latest
 +onap/sdc-elasticsearch,1.4-STAGING-latest
 +onap/sdc-frontend,1.4-STAGING-latest
 +onap/sdc-init-elasticsearch,1.4-STAGING-latest
 +onap/sdc-kibana,1.4-STAGING-latest
 +onap/sdc-onboard-backend,1.4-STAGING-latest
 +onap/sdc-onboard-cassandra-init,1.4-STAGING-latest
  onap/sdnc-ansible-server-image,1.4-STAGING-latest
  onap/sdnc-dmaap-listener-image,1.4-STAGING-latest
  onap/sdnc-image,1.4-STAGING-latest
@@@ -153,7 -153,7 +153,7 @@@ onap/vfc/wfengine-activiti,1.2.0-STAGIN
  onap/vfc/wfengine-mgrservice,1.2.0-STAGING-latest
  onap/vfc/ztesdncdriver,1.2.0-STAGING-latest
  onap/vfc/ztevnfmdriver,1.2.1-STAGING-latest
- onap/vid,3.2.0
+ onap/vid,3.2-STAGING-latest
  onap/vnfsdk/ice,1.1.0
  onap/vnfsdk/refrepo,1.2.0
  onap/vnfsdk/refrepo/postgres,1.2.0