tree ecb894a1bf61715ab177e8e064796a594b5aa591
parent b4c3e66d9e4a181b11e69eb5e06413b835c0f7c1
parent 1c2c3c2629bee4e8328719ffd041a10bec26c3c9
author Jenkins <jenkins@review.openstack.org> 1437424892 +0000
committer Gerrit Code Review <review@openstack.org> 1437424892 +0000

Merge "Update default merge failed error to mention CRD"