From: Gary Wu <gary.i.wu@huawei.com>
Date: Fri, 16 Nov 2018 01:16:36 +0000 (+0000)
Subject: Merge "Policy artifact release Nov 15"
X-Git-Tag: 4.0.0-ONAP~353
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=cce136febf15e3d6ca96faec670752e3e7fae921;hp=-c;p=integration.git

Merge "Policy artifact release Nov 15"
---

cce136febf15e3d6ca96faec670752e3e7fae921
diff --combined version-manifest/src/main/resources/docker-manifest-staging.csv
index 9992a6ba6,e14784f26..c5a6bebed
--- a/version-manifest/src/main/resources/docker-manifest-staging.csv
+++ b/version-manifest/src/main/resources/docker-manifest-staging.csv
@@@ -60,11 -60,11 +60,11 @@@ onap/multicloud/openstack-pike,1.2.2-ST
  onap/multicloud/openstack-windriver,1.2.2-STAGING
  onap/multicloud/vio,1.2.2-STAGING
  onap/multicloud/vio-vesagent,1.0.0
 -onap/music/cassandra_3_11,3.0.23
 -onap/music/cassandra_job,3.0.23
 +onap/music/cassandra_3_11,3.0.24
 +onap/music/cassandra_job,3.0.24
  onap/music/cassandra_music,3.0.0
 -onap/music/music,3.0.23
 -onap/music/prom,1.0.5-latest
 +onap/music/music,3.0.24
 +onap/music/prom,1.0.5
  onap/network-discovery,latest
  onap/oom/kube2msb,1.1.0
  onap/optf-cmso-dbinit,1.0.1
@@@ -90,7 -90,7 +90,7 @@@ onap/org.onap.dcaegen2.platform.policy-
  onap/org.onap.dcaegen2.platform.servicechange-handler,1.1.5
  onap/org.onap.dcaegen2.services.prh.prh-app-server,1.1.1
  onap/policy-apex-pdp,2.0-SNAPSHOT-latest
- onap/policy-distribution,2.0.2-SNAPSHOT-latest
+ onap/policy-distribution,2.0.3-SNAPSHOT-latest
  onap/policy-drools,1.3-SNAPSHOT-latest
  onap/policy-pe,1.3-SNAPSHOT-latest
  onap/pomba-aai-context-builder,1.3.3-SNAPSHOT-latest
diff --combined version-manifest/src/main/resources/docker-manifest.csv
index 2837b9284,4fbe4bc64..2423df931
--- a/version-manifest/src/main/resources/docker-manifest.csv
+++ b/version-manifest/src/main/resources/docker-manifest.csv
@@@ -54,11 -54,9 +54,11 @@@ onap/multicloud/openstack-pike,1.2.
  onap/multicloud/openstack-windriver,1.2.1
  onap/multicloud/vio,1.2.1
  onap/multicloud/vio-vesagent,1.0.0
 -onap/music/cassandra_3_11,3.0.23
 -onap/music/cassandra_job,3.0.23
 -onap/music/music,3.0.23
 +onap/music/cassandra_3_11,3.0.24
 +onap/music/cassandra_job,3.0.24
 +onap/music/cassandra_music,3.0.0
 +onap/music/music,3.0.24
 +onap/music/prom,1.0.5
  onap/oom/kube2msb,1.1.0
  onap/optf-cmso-dbinit,1.0.1
  onap/optf-cmso-service,1.0.1
@@@ -83,9 -81,9 +83,9 @@@ onap/org.onap.dcaegen2.platform.policy-
  onap/org.onap.dcaegen2.platform.servicechange-handler,1.1.5
  onap/org.onap.dcaegen2.services.prh.prh-app-server,1.1.1
  onap/policy-apex-pdp,2.0.3
- onap/policy-distribution,2.0.2
- onap/policy-drools,1.3.3
- onap/policy-pe,1.3.3
+ onap/policy-distribution,2.0.3
+ onap/policy-drools,1.3.4
+ onap/policy-pe,1.3.4
  onap/pomba-aai-context-builder,1.3.2
  onap/pomba-context-aggregator,1.3.4
  onap/pomba-network-discovery-context-builder,1.3.1