From: Yang Xu <yang.xu3@huawei.com>
Date: Thu, 18 Oct 2018 01:11:24 +0000 (+0000)
Subject: Merge "Add new docker images found in OOM"
X-Git-Tag: 3.0.0~166
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=269784658cc33e50b26ad929bc252e5bc5db1c69;p=integration.git

Merge "Add new docker images found in OOM"
---

269784658cc33e50b26ad929bc252e5bc5db1c69
diff --cc version-manifest/src/main/resources/docker-manifest-staging.csv
index dd5b4a26e,2b360f7f5..9138b72ec
--- a/version-manifest/src/main/resources/docker-manifest-staging.csv
+++ b/version-manifest/src/main/resources/docker-manifest-staging.csv
@@@ -32,12 -33,13 +33,13 @@@ onap/clamp-dashboard-kibana,3.0-STAGING
  onap/clamp-dashboard-logstash,3.0-STAGING-latest
  onap/cli,2.0.2
  onap/data-router,1.3-STAGING-latest
 -onap/dmaap/buscontroller,1.0.19
 +onap/dmaap/buscontroller,1.0.22
  onap/dmaap/datarouter-node,latest
  onap/dmaap/datarouter-prov,latest
 -onap/dmaap/dmaap-mr,1.1.6
 +onap/dmaap/dmaap-mr,1.1.8
  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.0-STAGING-latest
  onap/holmes/rule-management,1.2.0-STAGING-latest