From: Marco Platania <platania@research.att.com>
Date: Thu, 17 May 2018 14:38:54 +0000 (+0000)
Subject: Merge "Policy 1.2.2 image"
X-Git-Tag: v1.2.1~47
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=ad602452612da891c0c3c6aa7245bf7d856f4d62;hp=-c;p=demo.git

Merge "Policy 1.2.2 image"
---

ad602452612da891c0c3c6aa7245bf7d856f4d62
diff --combined heat/ONAP/onap_openstack.env
index aade5446,f8cfe975..72a18175
--- a/heat/ONAP/onap_openstack.env
+++ b/heat/ONAP/onap_openstack.env
@@@ -40,7 -40,7 +40,7 @@@ parameters
  
    dmaap_topic: AUTO
  
 -  artifacts_version: 1.2.0
 +  artifacts_version: 1.2.0-SNAPSHOT
  
    openstack_tenant_id: PUT YOUR OPENSTACK PROJECT ID HERE
  
@@@ -143,7 -143,7 +143,7 @@@
    aai_sparky_docker: 1.2-STAGING-latest
    appc_docker: 1.3.0-SNAPSHOT-latest
    so_docker: 1.2.1
-   policy_docker: 1.2.0
+   policy_docker: 1.2.2
    portal_docker: v2.2.0
    robot_docker: 1.2.0
    sdc_docker: 1.2-STAGING-latest