]> xenbits.xensource.com Git - osstest/openstack-nova.git/commitdiff
Merge "Remove extra ^M for json file"
authorJenkins <jenkins@review.openstack.org>
Fri, 9 Dec 2016 08:52:31 +0000 (08:52 +0000)
committerGerrit Code Review <review@openstack.org>
Fri, 9 Dec 2016 08:52:31 +0000 (08:52 +0000)

Trivial merge