tree 7269c97a16db11906c1afc64079d97569d94038c
parent 4dba0395e0e242add2a8c333d45c19d11e318fa1
parent 2190551738eb0672b52d0ed324b2ca1476b6f819
author Jenkins <jenkins@review.openstack.org> 1436930537 +0000
committer Gerrit Code Review <review@openstack.org> 1436930537 +0000

Merge "Switch all uses of json to oslo_serialization"