From: Jenkins <jenkins@review.openstack.org>
Date: Tue, 12 Jan 2016 17:31:04 +0000 (+0000)
Subject: Merge "Sahara Integration"
X-Git-Tag: opnfv-6.0.0~2224
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=c662d0f7cc2286b038e0a04f12507322fd2ba78f;p=apex-tripleo-heat-templates.git

Merge "Sahara Integration"
---

c662d0f7cc2286b038e0a04f12507322fd2ba78f