tree 16baf8cfeec00b960f40e3d2b5dbc5142c9f2165
parent aade838ee317d6c91eab8fa3757e7b952f6147f9
parent 19044d5d5bb4c7038d3038248c98277fcc6448fa
author Jenkins <jenkins@review.openstack.org> 1361534351 +0000
committer Gerrit Code Review <review@openstack.org> 1361534351 +0000

Merge "Simplify xml-json inheritance in compute"