From: Jenkins <jenkins@review.openstack.org>
Date: Wed, 28 Jun 2017 13:50:48 +0000 (+0000)
Subject: Merge "Split docker options and insecure registry"
X-Git-Tag: opnfv-6.0.0~126
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=669f0dfe04f36837f5350bdb387f85e5d49521c0;p=apex-puppet-tripleo.git

Merge "Split docker options and insecure registry"
---

669f0dfe04f36837f5350bdb387f85e5d49521c0