From: Jenkins <jenkins@review.openstack.org>
Date: Wed, 24 Apr 2013 18:29:25 +0000 (+0000)
Subject: Merge "Optionally allow ec2token config to come from .conf"
X-Git-Tag: 2014.1~698
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=b4263e9eb639c0f48faedfd50b62b9936b0ec937;p=openstack-build%2Fheat-build.git

Merge "Optionally allow ec2token config to come from .conf"
---

b4263e9eb639c0f48faedfd50b62b9936b0ec937