tree c0a1a2d6c21d4733b7fbfc5dc6bc076bc30d8488
parent 3dc5c7295d7c9f466c2a2ae3ce442cc010bec5c5
parent 5d5e20a2ee4644b31207027cbe0c02d07bf11b5d
author Jenkins <jenkins@review.openstack.org> 1452906671 +0000
committer Gerrit Code Review <review@openstack.org> 1452906672 +0000

Merge "Mark amazon image file config options deprecated"