Merge "Set default network interfaces to nic1"

author Jenkins <jenkins@review.openstack.org>

Fri, 19 Dec 2014 14:01:22 +0000 (14:01 +0000)

committer Gerrit Code Review <review@openstack.org>

Fri, 19 Dec 2014 14:01:22 +0000 (14:01 +0000)
author Jenkins <jenkins@review.openstack.org>
Fri, 19 Dec 2014 14:01:22 +0000 (14:01 +0000)
committer Gerrit Code Review <review@openstack.org>
Fri, 19 Dec 2014 14:01:22 +0000 (14:01 +0000)
diff --cc compute.yaml
Simple merge
diff --cc controller.yaml
Simple merge
diff --cc overcloud-source.yaml
Simple merge
diff --cc overcloud-without-mergepy.yaml
Simple merge
author	Jenkins <jenkins@review.openstack.org>
	Fri, 19 Dec 2014 14:01:22 +0000 (14:01 +0000)
committer	Gerrit Code Review <review@openstack.org>
	Fri, 19 Dec 2014 14:01:22 +0000 (14:01 +0000)
		1	2
compute.yaml	patch \|	diff1 \|	diff2 \|	blob \| history
controller.yaml	patch \|	diff1 \|	diff2 \|	blob \| history
overcloud-source.yaml	patch \|	diff1 \|	diff2 \|	blob \| history
overcloud-without-mergepy.yaml	patch \|	diff1 \|	diff2 \|	blob \| history