Merge "Split docker options and insecure registry"
authorJenkins <jenkins@review.openstack.org>
Wed, 28 Jun 2017 13:50:48 +0000 (13:50 +0000)
committerGerrit Code Review <review@openstack.org>
Wed, 28 Jun 2017 13:50:48 +0000 (13:50 +0000)
commit669f0dfe04f36837f5350bdb387f85e5d49521c0
tree9db5624ee04d761402fe7642def8c0dd42041b98
parentf99b72a6867c144c6a313994cd1e7d8e330b7c6d
parentee5301929877a5330b93f99e1ca5958ca5963eb5
Merge "Split docker options and insecure registry"