From: Gary Wu Date: Fri, 14 Dec 2018 17:17:32 +0000 (+0000) Subject: Merge "r3.0.1 version updates" into casablanca X-Git-Tag: 3.0.1-ONAP~32 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=8d17ac87ca355b7aac12abc8ca27b02bd3278a66;p=integration.git Merge "r3.0.1 version updates" into casablanca --- 8d17ac87ca355b7aac12abc8ca27b02bd3278a66 diff --cc version-manifest/src/main/resources/docker-manifest-staging.csv index fe8e4102a,0d97d2203..8d9bd791c --- a/version-manifest/src/main/resources/docker-manifest-staging.csv +++ b/version-manifest/src/main/resources/docker-manifest-staging.csv @@@ -72,10 -72,10 +72,10 @@@ onap/network-discovery,1.4. 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-has,1.2.5 onap/optf-osdf,1.2.4 - 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.datafile.datafile-app-server,1.0.5 + onap/org.onap.dcaegen2.collectors.hv-ves.hv-collector-main,1.0.2 onap/org.onap.dcaegen2.collectors.snmptrap,1.4.0 onap/org.onap.dcaegen2.collectors.ves.vescollector,1.3.1 onap/org.onap.dcaegen2.deployments.bootstrap,1.1.3 diff --cc version-manifest/src/main/resources/docker-manifest.csv index 4f36596ff,7a73097cd..b55de72d6 --- a/version-manifest/src/main/resources/docker-manifest.csv +++ b/version-manifest/src/main/resources/docker-manifest.csv @@@ -71,10 -71,10 +71,10 @@@ onap/network-discovery,1.4. 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-has,1.2.5 onap/optf-osdf,1.2.4 - 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.datafile.datafile-app-server,1.0.5 + onap/org.onap.dcaegen2.collectors.hv-ves.hv-collector-main,1.0.2 onap/org.onap.dcaegen2.collectors.snmptrap,1.4.0 onap/org.onap.dcaegen2.collectors.ves.vescollector,1.3.1 onap/org.onap.dcaegen2.deployments.bootstrap,1.1.3