From: Gary Wu <gary.i.wu@huawei.com>
Date: Tue, 30 Apr 2019 15:13:14 +0000 (+0000)
Subject: Merge "Add Lenovo ThinkCloud Driver in integration"
X-Git-Tag: 4.0.0-ONAP~144
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=441917a37a76af625c77a7d86e96111aed11150f;hp=-c;p=integration.git

Merge "Add Lenovo ThinkCloud Driver in integration"
---

441917a37a76af625c77a7d86e96111aed11150f
diff --combined version-manifest/src/main/resources/docker-manifest-staging.csv
index 9a2749529,b57724dd5..7f9a30211
--- a/version-manifest/src/main/resources/docker-manifest-staging.csv
+++ b/version-manifest/src/main/resources/docker-manifest-staging.csv
@@@ -59,10 -59,11 +59,11 @@@ onap/msb/msb_apigateway,1.2.4-STAGING-l
  onap/msb/msb_discovery,1.2.3-STAGING-latest
  onap/multicloud/azure,1.2.1
  onap/multicloud/framework,1.3.0-STAGING
+ onap/multicloud/openstack-lenovo,1.3.2-STAGING
  onap/multicloud/openstack-ocata,1.3.0-STAGING
  onap/multicloud/openstack-pike,1.3.0-STAGING
  onap/multicloud/openstack-windriver,1.3.0-STAGING
 -onap/multicloud/vio,1.3.0-STAGING
 +onap/multicloud/vio,1.3.1-STAGING
  onap/music/cassandra_3_11,3.0.24
  onap/music/cassandra_job,3.0.24
  onap/music/cassandra_music,3.0.0
@@@ -157,13 -158,13 +158,13 @@@ onap/vfc/vnfmgr,1.3.0-STAGING-lates
  onap/vfc/vnfres,1.3.0-STAGING-latest
  onap/vfc/wfengine-activiti,1.3.0-STAGING-latest
  onap/vfc/wfengine-mgrservice,1.3.0-STAGING-latest
 -onap/vfc/ztesdncdriver,1.2.0-STAGING-latest
 +onap/vfc/ztesdncdriver,1.3.0-STAGING-latest
  onap/vfc/ztevnfmdriver,1.3.0-STAGING-latest
  onap/vid,4.0-STAGING-latest
  onap/vnfsdk/ice,1.1.0
  onap/vnfsdk/refrepo,1.2.0
  onap/vnfsdk/refrepo/postgres,1.2.0
  onap/vnfsdk/vnftest,1.1.0
 -onap/workflow-backend,1.4.0-SNAPSHOT
 -onap/workflow-frontend,1.4.0-SNAPSHOT
 -onap/workflow-init,1.4.0-SNAPSHOT
 +onap/workflow-backend,latest
 +onap/workflow-frontend,latest
 +onap/workflow-init,latest
diff --combined version-manifest/src/main/resources/docker-manifest.csv
index 64daa1904,be73a00eb..5415cb5a3
--- a/version-manifest/src/main/resources/docker-manifest.csv
+++ b/version-manifest/src/main/resources/docker-manifest.csv
@@@ -55,10 -55,11 +55,11 @@@ onap/msb/msb_apigateway,1.2.
  onap/msb/msb_discovery,1.2.1
  onap/multicloud/azure,1.2.2
  onap/multicloud/framework,1.2.2
+ onap/multicloud/openstack-lenovo,1.3.1
  onap/multicloud/openstack-ocata,1.2.4
  onap/multicloud/openstack-pike,1.2.4
  onap/multicloud/openstack-windriver,1.2.4
 -onap/multicloud/vio,1.2.2
 +onap/multicloud/vio,1.3.1
  onap/music/cassandra_3_11,3.0.24
  onap/music/cassandra_job,3.0.24
  onap/music/cassandra_music,3.0.0
diff --combined version-manifest/src/main/resources/java-manifest.csv
index cce0b9821,f34b6d284..b026ec33e
--- a/version-manifest/src/main/resources/java-manifest.csv
+++ b/version-manifest/src/main/resources/java-manifest.csv
@@@ -219,10 -219,11 +219,11 @@@ org.onap.msb.java-sdk,msb-java-sdk,1.1.
  org.onap.msb.swagger-sdk,swagger-sdk,1.1.0
  org.onap.multicloud.azure,multicloud-azure,1.2.2
  org.onap.multicloud.framework,multivimbroker,1.2.2
+ org.onap.multicloud.openstack,lenovo,1.3.1
  org.onap.multicloud.openstack,ocata,1.2.4
  org.onap.multicloud.openstack,pike,1.2.4
  org.onap.multicloud.openstack,windriver,1.2.4
 -org.onap.multicloud.openstack.vmware,vio,1.2.2
 +org.onap.multicloud.openstack.vmware,vio,1.3.1
  org.onap.music,MUSIC,3.0.23
  org.onap.oparent,oparent,1.2.3
  org.onap.policy.apex-pdp,apex-pdp,2.0.4