tree 71d976901479ac12c6df4542c9682f9f06029cd3
parent 940b1a5edd06fefa1a23c68e6262b8a9e18db317
parent 319b37a9e4ce2497156f4a9985c168ac1668dbd6
author Jenkins <jenkins@review.openstack.org> 1405369383 +0000
committer Gerrit Code Review <review@openstack.org> 1405369383 +0000

Merge "fix javelin to let you specify imgdir"