Merge "Adds the NeutronTunnelIdRanges and NeutronVniRanges parameters"

author Jenkins <jenkins@review.openstack.org>

Wed, 15 Jul 2015 15:22:03 +0000 (15:22 +0000)

committer Gerrit Code Review <review@openstack.org>

Wed, 15 Jul 2015 15:22:03 +0000 (15:22 +0000)
author Jenkins <jenkins@review.openstack.org>
Wed, 15 Jul 2015 15:22:03 +0000 (15:22 +0000)
committer Gerrit Code Review <review@openstack.org>
Wed, 15 Jul 2015 15:22:03 +0000 (15:22 +0000)
diff --cc controller.yaml
Simple merge
diff --cc overcloud-without-mergepy.yaml
Simple merge
diff --cc puppet/controller-puppet.yaml
Simple merge
author	Jenkins <jenkins@review.openstack.org>
	Wed, 15 Jul 2015 15:22:03 +0000 (15:22 +0000)
committer	Gerrit Code Review <review@openstack.org>
	Wed, 15 Jul 2015 15:22:03 +0000 (15:22 +0000)
		1	2
controller.yaml	patch \|	diff1 \|	diff2 \|	blob \| history
overcloud-without-mergepy.yaml	patch \|	diff1 \|	diff2 \|	blob \| history
puppet/controller-puppet.yaml	patch \|	diff1 \|	diff2 \|	blob \| history