Merge "Updated the docker version"
authorMarco Platania <platania@research.att.com>
Thu, 16 Nov 2017 13:42:44 +0000 (13:42 +0000)
committerGerrit Code Review <gerrit@onap.org>
Thu, 16 Nov 2017 13:42:44 +0000 (13:42 +0000)
1  2 
heat/ONAP/onap_openstack.env

Simple merge