Merge "Move iscsid to a container"

author Jenkins <jenkins@review.openstack.org>

Wed, 14 Jun 2017 01:00:01 +0000 (01:00 +0000)

committer Gerrit Code Review <review@openstack.org>

Wed, 14 Jun 2017 01:00:01 +0000 (01:00 +0000)
author Jenkins <jenkins@review.openstack.org>
Wed, 14 Jun 2017 01:00:01 +0000 (01:00 +0000)
committer Gerrit Code Review <review@openstack.org>
Wed, 14 Jun 2017 01:00:01 +0000 (01:00 +0000)
diff --cc environments/docker.yaml
Simple merge
diff --cc roles/BlockStorage.yaml
Simple merge
diff --cc roles/Compute.yaml
Simple merge
diff --cc roles/Controller.yaml
Simple merge
diff --cc roles_data.yaml
Simple merge
author	Jenkins <jenkins@review.openstack.org>
	Wed, 14 Jun 2017 01:00:01 +0000 (01:00 +0000)
committer	Gerrit Code Review <review@openstack.org>
	Wed, 14 Jun 2017 01:00:01 +0000 (01:00 +0000)
		1	2
environments/docker.yaml	patch \|	diff1 \|	diff2 \|	blob \| history
roles/BlockStorage.yaml	patch \|	diff1 \|	diff2 \|	blob \| history
roles/Compute.yaml	patch \|	diff1 \|	diff2 \|	blob \| history
roles/Controller.yaml	patch \|	diff1 \|	diff2 \|	blob \| history
roles_data.yaml	patch \|	diff1 \|	diff2 \|	blob \| history