Merge "docker: eliminate copy-json.py in favor of json-file"
authorJenkins <jenkins@review.openstack.org>
Tue, 31 Jan 2017 10:15:48 +0000 (10:15 +0000)
committerGerrit Code Review <review@openstack.org>
Tue, 31 Jan 2017 10:15:48 +0000 (10:15 +0000)

Trivial merge