tree ce36aff69ef74deeb6d053b76a61651cee62226b
parent e1ae0b725bb352f2cd9454aa357bead72fda2d1c
parent 9f21d0e1421cd0736a02fdcddcab9f0a58b0fdb1
author Jenkins <jenkins@review.openstack.org> 1441357892 +0000
committer Gerrit Code Review <review@openstack.org> 1441357892 +0000

Merge "Switch remaining json import to oslo_serialization"