From: Gary Wu <gary.i.wu@huawei.com>
Date: Thu, 7 Feb 2019 18:10:27 +0000 (+0000)
Subject: Merge "Update SO docker manifests to 1.3.6"
X-Git-Tag: 4.0.0-ONAP~280
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=7f27c2aa8401d588534be2bcfa69bd7fa5308ef7;hp=-c;p=integration.git

Merge "Update SO docker manifests to 1.3.6"
---

7f27c2aa8401d588534be2bcfa69bd7fa5308ef7
diff --combined version-manifest/src/main/resources/docker-manifest-staging.csv
index 39f414e9e,0c719a384..523c30cd6
--- a/version-manifest/src/main/resources/docker-manifest-staging.csv
+++ b/version-manifest/src/main/resources/docker-manifest-staging.csv
@@@ -58,7 -58,7 +58,7 @@@ onap/multicloud/openstack-newton,1.2.
  onap/multicloud/openstack-ocata,1.2.3
  onap/multicloud/openstack-pike,1.2.3
  onap/multicloud/openstack-windriver,1.2.3
 -onap/multicloud/vio,1.2.1
 +onap/multicloud/vio,1.2.3
  onap/multicloud/vio-vesagent,1.0.0
  onap/music/cassandra_3_11,3.0.24
  onap/music/cassandra_job,3.0.24
@@@ -119,15 -119,15 +119,15 @@@ onap/sdnc-ueb-listener-image,1.4-STAGIN
  onap/search-data-service,1.3-STAGING-latest
  onap/service-decomposition,1.4.2
  onap/sniroemulator,1.0.0
- onap/so/api-handler-infra,1.3.2-STAGING-latest
- onap/so/bpmn-infra,1.3.2-STAGING-latest
- onap/so/catalog-db-adapter,1.3.2-STAGING-latest
- onap/so/openstack-adapter,1.3.2-STAGING-latest
- onap/so/request-db-adapter,1.3.2-STAGING-latest
- onap/so/sdc-controller,1.3.2-STAGING-latest
- onap/so/sdnc-adapter,1.3.2-STAGING-latest
- onap/so/so-monitoring,1.3.2-STAGING-latest
- onap/so/vfc-adapter,1.3.2-STAGING-latest
+ onap/so/api-handler-infra,1.3.6-STAGING-latest
+ onap/so/bpmn-infra,1.3.6-STAGING-latest
+ onap/so/catalog-db-adapter,1.3.6-STAGING-latest
+ onap/so/openstack-adapter,1.3.6-STAGING-latest
+ onap/so/request-db-adapter,1.3.6-STAGING-latest
+ onap/so/sdc-controller,1.3.6-STAGING-latest
+ onap/so/sdnc-adapter,1.3.6-STAGING-latest
+ onap/so/so-monitoring,1.3.6-STAGING-latest
+ onap/so/vfc-adapter,1.3.6-STAGING-latest
  onap/sparky-be,1.3-STAGING-latest
  onap/spike,1.3-STAGING-latest
  onap/testsuite,1.4.0-STAGING-latest
diff --combined version-manifest/src/main/resources/docker-manifest.csv
index e468506f6,da6251da3..e8f282827
--- a/version-manifest/src/main/resources/docker-manifest.csv
+++ b/version-manifest/src/main/resources/docker-manifest.csv
@@@ -58,7 -58,7 +58,7 @@@ onap/multicloud/openstack-newton,1.2.
  onap/multicloud/openstack-ocata,1.2.2
  onap/multicloud/openstack-pike,1.2.2
  onap/multicloud/openstack-windriver,1.2.2
 -onap/multicloud/vio,1.2.1
 +onap/multicloud/vio,1.2.3
  onap/multicloud/vio-vesagent,1.0.0
  onap/music/cassandra_3_11,3.0.24
  onap/music/cassandra_job,3.0.24
@@@ -120,15 -120,15 +120,15 @@@ onap/sdnc-ueb-listener-image,1.4.
  onap/search-data-service,1.3.1
  onap/service-decomposition,1.4.2
  onap/sniroemulator,1.0.0
- onap/so/api-handler-infra,1.3.2
- onap/so/bpmn-infra,1.3.2
- onap/so/catalog-db-adapter,1.3.2
- onap/so/openstack-adapter,1.3.2
- onap/so/request-db-adapter,1.3.2
- onap/so/sdc-controller,1.3.2
- onap/so/sdnc-adapter,1.3.2
- onap/so/so-monitoring,1.3.2
- onap/so/vfc-adapter,1.3.2
+ onap/so/api-handler-infra,1.3.6
+ onap/so/bpmn-infra,1.3.6
+ onap/so/catalog-db-adapter,1.3.6
+ onap/so/openstack-adapter,1.3.6
+ onap/so/request-db-adapter,1.3.6
+ onap/so/sdc-controller,1.3.6
+ onap/so/sdnc-adapter,1.3.6
+ onap/so/so-monitoring,1.3.6
+ onap/so/vfc-adapter,1.3.6
  onap/sparky-be,1.3.0
  onap/spike,1.3.1
  onap/testsuite,1.3.2