From: Dan Radez <dradez@redhat.com>
Date: Tue, 14 Jun 2016 12:53:42 +0000 (+0000)
Subject: Merge "puppet-tripleo fork integration"
X-Git-Tag: colorado.1.0~174
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=0a85539980ec943f3e590dd279d1a129fb7966c3;p=apex.git

Merge "puppet-tripleo fork integration"
---

0a85539980ec943f3e590dd279d1a129fb7966c3