tree 607e503380bb530c186d6ec7ecb91a7262f13822
parent e3cb8ab78b2079001f55a231f46cafc261f20213
parent 4f10e45db7bf0eb11ab40cf52398e3038b1cf1b5
author Jenkins <jenkins@review.openstack.org> 1427982888 +0000
committer Gerrit Code Review <review@openstack.org> 1427982888 +0000

Merge "Clarify how to resolve a uuid collision"