commit 1235f86c47589d228c33057a5cd62c33258ae5c3
author Marco Platania <platania@research.att.com> Tue May 01 16:02:51 2018 +0000
committer Gerrit Code Review <gerrit@onap.org> Tue May 01 16:02:51 2018 +0000
tree 3b54ea9ced1a6f747ca5d51e46077eeeb613a7aa
parent 760f1a61f031341700fdc5fcb9b865aaab152b93
parent 35a76d7c8369532c4f31b9037c41fa2ded09de56

Merge "Sync docker manifest with heat template versions"

version-manifest/src/main/resources/docker-manifest.csv

diff --git a/version-manifest/src/main/resources/docker-manifest.csv b/version-manifest/src/main/resources/docker-manifest.csv
index e8e6f58..c7930b1 100644
--- a/version-manifest/src/main/resources/docker-manifest.csv
+++ b/version-manifest/src/main/resources/docker-manifest.csv
@@ -10,21 +10,22 @@
 onap/ccsdk-odl-image,0.2.1-SNAPSHOT
 onap/ccsdk-odlsli-image,0.2.1-SNAPSHOT
 onap/clamp,2.0-STAGING-latest
-onap/cli,v1.1.0
+onap/cli,2.0-STAGING-latest
 onap/data-router,1.2-STAGING-latest
+onap/dmaap/buscontroller,latest
 onap/dmaap/dmaap-mr,1.0.1
 onap/externalapi/nbi,latest
-onap/holmes/engine-management,v1.0.0
-onap/holmes/rule-management,v1.0.0
+onap/holmes/engine-management,latest
+onap/holmes/rule-management,latest
 onap/model-loader,1.2-STAGING-latest
 onap/modeling/javatoscachecker,latest
 onap/msb/msb_apigateway,1.1.0-STAGING-latest
 onap/msb/msb_discovery,1.1.0-STAGING-latest
-onap/multicloud/framework,v1.0.0
-onap/multicloud/openstack-newton,1.0.0-SNAPSHOT
-onap/multicloud/openstack-ocata,1.0.0-SNAPSHOT
-onap/multicloud/openstack-windriver,1.0.0-SNAPSHOT
-onap/multicloud/vio,1.0.0-SNAPSHOT
+onap/multicloud/framework,1.1.0-SNAPSHOT
+onap/multicloud/openstack-newton,1.1.2-SNAPSHOT
+onap/multicloud/openstack-ocata,1.1.2-SNAPSHOT
+onap/multicloud/openstack-windriver,1.1.2-SNAPSHOT
+onap/multicloud/vio,1.1.0-SNAPSHOT
 onap/multicloud/vio-vesagent,1.0.0
 onap/music,latest
 onap/oof,latest