From: Jenkins <jenkins@review.openstack.org>
Date: Mon, 28 Jul 2014 08:42:19 +0000 (+0000)
Subject: Merge "Add user_data_format"
X-Git-Tag: opnfv-6.0.0~2795
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=9eabe0840fd090ac07790cafed15e0166a856b4e;p=apex-tripleo-heat-templates.git

Merge "Add user_data_format"
---

9eabe0840fd090ac07790cafed15e0166a856b4e