tree 201ea5ce1874dd9ecd9fc3069c7d648b5c2355f5
parent 3dc5a99e3710bc00e3fa58c0180992073e111b85
parent 1d50d78560910779d28db85591fbb67e1617ff34
author Jenkins <jenkins@review.openstack.org> 1392318555 +0000
committer Gerrit Code Review <review@openstack.org> 1392318555 +0000

Merge "Fix service name for marconi"