From: Gary Wu <gary.i.wu@huawei.com>
Date: Thu, 8 Nov 2018 00:52:53 +0000 (+0000)
Subject: Merge "update sdc and work flow versions."
X-Git-Tag: 3.0.0~79
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=4ee737cff74c52411b1d2f1455e15055f176b7ab;hp=-c;p=integration.git

Merge "update sdc and work flow versions."
---

4ee737cff74c52411b1d2f1455e15055f176b7ab
diff --combined version-manifest/src/main/resources/docker-manifest-staging.csv
index a267870ae,d72577a7a..8e82303c1
--- a/version-manifest/src/main/resources/docker-manifest-staging.csv
+++ b/version-manifest/src/main/resources/docker-manifest-staging.csv
@@@ -37,13 -37,13 +37,13 @@@ onap/data-router,1.3-STAGING-lates
  onap/dmaap/buscontroller,1.0.23
  onap/dmaap/datarouter-node,latest
  onap/dmaap/datarouter-prov,latest
 -onap/dmaap/dmaap-mr,1.1.8
 +onap/dmaap/dmaap-mr,1.1.9
  onap/dmaap/kafka01101,0.0.1
  onap/externalapi/nbi,3.0.0-latest
  onap/fproxy,2.1-STAGING-latest
  onap/gizmo,1.3-STAGING-latest
  onap/holmes/engine-management,1.2.2-STAGING-latest
 -onap/holmes/rule-management,1.2.2-STAGING-latest
 +onap/holmes/rule-management,1.2.3-STAGING-latest
  onap/model-loader,1.3-STAGING-latest
  onap/msb/msb_apigateway,1.2.2-STAGING-latest
  onap/msb/msb_discovery,1.2.2-STAGING-latest
@@@ -62,11 -62,9 +62,11 @@@ onap/music/music,3.0.2
  onap/music/prom,1.0.5-latest
  onap/network-discovery,latest
  onap/oom/kube2msb,1.1.0
 +onap/optf-cmso-dbinit,1.0.1
 +onap/optf-cmso-service,1.0.1
  onap/optf-has,1.2.4
  onap/optf-osdf,1.2.4
 -onap/org.onap.dcaegen2.collectors.datafile.datafile-app-server,1.0.3
 +onap/org.onap.dcaegen2.collectors.datafile.datafile-app-server,1.0.4
  onap/org.onap.dcaegen2.collectors.hv-ves.hv-collector-main,1.0.0
  onap/org.onap.dcaegen2.collectors.snmptrap,1.4.0
  onap/org.onap.dcaegen2.collectors.ves.vescollector,1.3.1
@@@ -148,7 -146,7 +148,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.0
 -onap/vid,3.1-STAGING-latest
 +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
@@@ -161,6 -159,6 +161,6 @@@ onap/vvp/jenkins,1.0.
  onap/vvp/portal,1.0.0
  onap/vvp/postgresql,1.0.0
  onap/vvp/test-engine,1.0.0
- onap/workflow-backend,1.3.1-SNAPSHOT
- onap/workflow-frontend,1.3.1-SNAPSHOT
- onap/workflow-init,1.3.1-SNAPSHOT
+ onap/workflow-backend,1.3.2-SNAPSHOT
+ onap/workflow-frontend,1.3.2-SNAPSHOT
+ onap/workflow-init,1.3.2-SNAPSHOT
diff --combined version-manifest/src/main/resources/docker-manifest.csv
index 94c374a3d,77d94f130..ab313abf4
--- a/version-manifest/src/main/resources/docker-manifest.csv
+++ b/version-manifest/src/main/resources/docker-manifest.csv
@@@ -37,12 -37,12 +37,12 @@@ onap/data-router,1.3.
  onap/dmaap/buscontroller,1.0.23
  onap/dmaap/datarouter-node,1.0.3
  onap/dmaap/datarouter-prov,1.0.3
 -onap/dmaap/dmaap-mr,1.1.7
 +onap/dmaap/dmaap-mr,1.1.8
  onap/dmaap/kafka01101,0.0.1
  onap/externalapi/nbi,3.0.1
  onap/gizmo,1.3.0
 -onap/holmes/engine-management,1.2.1
 -onap/holmes/rule-management,1.2.1
 +onap/holmes/engine-management,1.2.2
 +onap/holmes/rule-management,1.2.3
  onap/model-loader,1.3.0
  onap/msb/msb_apigateway,1.2.1
  onap/msb/msb_discovery,1.2.1
@@@ -58,11 -58,9 +58,11 @@@ onap/music/cassandra_3_11,3.0.2
  onap/music/cassandra_job,3.0.23
  onap/music/music,3.0.23
  onap/oom/kube2msb,1.1.0
 +onap/optf-cmso-dbinit,1.0.1
 +onap/optf-cmso-service,1.0.1
  onap/optf-has,1.2.4
  onap/optf-osdf,1.2.4
 -onap/org.onap.dcaegen2.collectors.datafile.datafile-app-server,1.0.3
 +onap/org.onap.dcaegen2.collectors.datafile.datafile-app-server,1.0.4
  onap/org.onap.dcaegen2.collectors.hv-ves.hv-collector-main,1.0.0
  onap/org.onap.dcaegen2.collectors.snmptrap,1.4.0
  onap/org.onap.dcaegen2.collectors.ves.vescollector,1.3.1
@@@ -92,16 -90,16 +92,16 @@@ onap/portal-app,2.3.
  onap/portal-db,2.3.1
  onap/portal-sdk,2.3.1
  onap/portal-wms,2.3.1
- onap/sdc-backend,1.3.0
- onap/sdc-backend-init,1.3.0
- onap/sdc-cassandra,1.3.0
- onap/sdc-cassandra-init,1.3.0
- onap/sdc-elasticsearch,1.3.0
- onap/sdc-frontend,1.3.0
- onap/sdc-init-elasticsearch,1.3.0
- onap/sdc-kibana,1.3.0
- onap/sdc-onboard-backend,1.3.0
- onap/sdc-onboard-cassandra-init,1.3.0
+ onap/sdc-backend,1.3.2
+ onap/sdc-backend-init,1.3.2
+ onap/sdc-cassandra,1.3.2
+ onap/sdc-cassandra-init,1.3.2
+ onap/sdc-elasticsearch,1.3.2
+ onap/sdc-frontend,1.3.2
+ onap/sdc-init-elasticsearch,1.3.2
+ onap/sdc-kibana,1.3.2
+ onap/sdc-onboard-backend,1.3.2
+ onap/sdc-onboard-cassandra-init,1.3.2
  onap/sdnc-ansible-server-image,1.4.1
  onap/sdnc-dmaap-listener-image,1.4.1
  onap/sdnc-image,1.4.1
@@@ -139,7 -137,7 +139,7 @@@ onap/vfc/wfengine-activiti,1.2.
  onap/vfc/wfengine-mgrservice,1.2.0
  onap/vfc/ztesdncdriver,1.2.0
  onap/vfc/ztevnfmdriver,1.2.0
 -onap/vid,3.0.0
 +onap/vid,3.2.0
  onap/vnfsdk/ice,1.1.0
  onap/vnfsdk/refrepo,1.2.0
  onap/vnfsdk/refrepo/postgres,1.2.0
@@@ -152,6 -150,6 +152,6 @@@ onap/vvp/jenkins,1.0.
  onap/vvp/portal,1.0.0
  onap/vvp/postgresql,1.0.0
  onap/vvp/test-engine,1.0.0
- onap/workflow-backend,1.3.0
- onap/workflow-frontend,1.3.0
- onap/workflow-init,1.3.0
+ onap/workflow-backend,1.3.1
+ onap/workflow-frontend,1.3.1
+ onap/workflow-init,1.3.1