From: Yang Xu <yang.xu3@huawei.com>
Date: Sun, 31 Mar 2019 15:37:24 +0000 (+0000)
Subject: Merge "switch drools pdp image to new one"
X-Git-Tag: 4.0.0-ONAP~200
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=integration.git;a=commitdiff_plain;h=aea5a492d4fb8982b36ea36a3495dea89ef0a09d

Merge "switch drools pdp image to new one"
---

aea5a492d4fb8982b36ea36a3495dea89ef0a09d
diff --cc version-manifest/src/main/resources/docker-manifest-staging.csv
index fc6a08b84,61527eeb8..9d11eed21
--- a/version-manifest/src/main/resources/docker-manifest-staging.csv
+++ b/version-manifest/src/main/resources/docker-manifest-staging.csv
@@@ -75,31 -76,27 +75,31 @@@ onap/optf-cmso-dbinit,1.0.
  onap/optf-cmso-service,1.0.1
  onap/optf-has,1.2.5
  onap/optf-osdf,1.2.4
 +onap/org.onap.dcaegen2.analytics.tca-gen2.dcae-analytics-tca-web,3.0.0-SNAPSHOT
  onap/org.onap.dcaegen2.collectors.datafile.datafile-app-server,1.1.1-SNAPSHOT
  onap/org.onap.dcaegen2.collectors.hv-ves.hv-collector-main,1.1.0-SNAPSHOT
 -onap/org.onap.dcaegen2.collectors.snmptrap,1.4.0
 -onap/org.onap.dcaegen2.collectors.ves.vescollector,1.3.1
 +onap/org.onap.dcaegen2.collectors.restconfcollector,latest
 +onap/org.onap.dcaegen2.collectors.snmptrap,1.4-STAGING-latest
 +onap/org.onap.dcaegen2.collectors.ves.vescollector,1.4.3-SNAPSHOT
  onap/org.onap.dcaegen2.deployments.bootstrap,1.1.3
 -onap/org.onap.dcaegen2.deployments.cm-container,1.5.1
 -onap/org.onap.dcaegen2.deployments.healthcheck-container,1.2.4
 -onap/org.onap.dcaegen2.deployments.k8s-bootstrap-container,1.4.9
 -onap/org.onap.dcaegen2.deployments.redis-cluster-container,1.0.0
 -onap/org.onap.dcaegen2.deployments.tca-cdap-container,1.1.0
 -onap/org.onap.dcaegen2.deployments.tls-init-container,1.0.0
 -onap/org.onap.dcaegen2.platform.cdapbroker,4.1.0
 -onap/org.onap.dcaegen2.platform.configbinding.app-app,2.2.3
 +onap/org.onap.dcaegen2.deployments.cm-container,1.5.2-STAGING-latest
 +onap/org.onap.dcaegen2.deployments.consul-loader-container,1.0-STAGING-latest
 +onap/org.onap.dcaegen2.deployments.healthcheck-container,1.2.4-STAGING-latest
 +onap/org.onap.dcaegen2.deployments.k8s-bootstrap-container,1.4.10-STAGING-latest
 +onap/org.onap.dcaegen2.deployments.redis-cluster-container,1.0-STAGING-latest
 +onap/org.onap.dcaegen2.deployments.tca-cdap-container,1.1-STAGING-latest
 +onap/org.onap.dcaegen2.deployments.tls-init-container,1.0-STAGING-latest
 +onap/org.onap.dcaegen2.platform.configbinding.app-app,2.3-STAGING-latest
  onap/org.onap.dcaegen2.platform.deployment-handler,3.2.0
 -onap/org.onap.dcaegen2.platform.inventory-api,3.0.4
 -onap/org.onap.dcaegen2.platform.policy-handler,4.6.0-STAGING-latest
 -onap/org.onap.dcaegen2.platform.servicechange-handler,1.1.5
 -onap/org.onap.dcaegen2.services.prh.prh-app-server,1.2.1
 +onap/org.onap.dcaegen2.platform.inventory-api,3.2.0
 +onap/org.onap.dcaegen2.platform.policy-handler,4.6-STAGING-latest
 +onap/org.onap.dcaegen2.platform.servicechange-handler,latest
 +onap/org.onap.dcaegen2.services.heartbeat,latest
 +onap/org.onap.dcaegen2.services.pm-mapper,latest
 +onap/org.onap.dcaegen2.services.prh.prh-app-server,1.2.1-SNAPSHOT
  onap/policy-apex-pdp,2.1-SNAPSHOT-latest
  onap/policy-distribution,2.1.0-SNAPSHOT-latest
- onap/policy-drools,1.4-SNAPSHOT-latest
+ onap/policy-pdpd-cl,1.4-SNAPSHOT-latest
  onap/policy-pe,1.4-SNAPSHOT-latest
  onap/pomba-aai-context-builder,1.4.0-SNAPSHOT-latest
  onap/pomba-context-aggregator,1.4.0-SNAPSHOT-latest