tree bc94bef05ecd91fae62127b3378b9f2ed5091119
parent d6997d317685353482a0aa7a18408c1313583460
parent 0b3aacc707ab8b3593285e02dc172b3c96730efc
author Jenkins <jenkins@review.openstack.org> 1392428691 +0000
committer Gerrit Code Review <review@openstack.org> 1392428691 +0000

Merge "Fix MARCONI_USER"