Merge "Configure dockerd with --iptables=false"

author Jenkins <jenkins@review.openstack.org>

Fri, 4 Aug 2017 16:36:45 +0000 (16:36 +0000)

committer Gerrit Code Review <review@openstack.org>

Fri, 4 Aug 2017 16:36:45 +0000 (16:36 +0000)
author Jenkins <jenkins@review.openstack.org>
Fri, 4 Aug 2017 16:36:45 +0000 (16:36 +0000)
committer Gerrit Code Review <review@openstack.org>
Fri, 4 Aug 2017 16:36:45 +0000 (16:36 +0000)
diff --cc manifests/profile/base/docker.pp
Simple merge
diff --cc spec/classes/tripleo_profile_base_docker_spec.rb
Simple merge
author	Jenkins <jenkins@review.openstack.org>
	Fri, 4 Aug 2017 16:36:45 +0000 (16:36 +0000)
committer	Gerrit Code Review <review@openstack.org>
	Fri, 4 Aug 2017 16:36:45 +0000 (16:36 +0000)
		1	2
manifests/profile/base/docker.pp	patch \|	diff1 \|	diff2 \|	blob \| history
spec/classes/tripleo_profile_base_docker_spec.rb	patch \|	diff1 \|	diff2 \|	blob \| history