Merge "Increase number of hugepages allocated for nova" into stable/colorado

author Michal Skalski <mskalski@mirantis.com>

Sat, 17 Sep 2016 12:50:47 +0000 (12:50 +0000)

committer Gerrit Code Review <gerrit@172.30.200.206>

Sat, 17 Sep 2016 12:50:48 +0000 (12:50 +0000)
author Michal Skalski <mskalski@mirantis.com>
Sat, 17 Sep 2016 12:50:47 +0000 (12:50 +0000)
committer Gerrit Code Review <gerrit@172.30.200.206>
Sat, 17 Sep 2016 12:50:48 +0000 (12:50 +0000)
diff --cc deploy/scenario/ha_nfv-ovs_heat_ceilometer_scenario.yaml
Simple merge
diff --cc deploy/scenario/no-ha_nfv-ovs_heat_ceilometer_scenario.yaml
Simple merge
author	Michal Skalski <mskalski@mirantis.com>
	Sat, 17 Sep 2016 12:50:47 +0000 (12:50 +0000)
committer	Gerrit Code Review <gerrit@172.30.200.206>
	Sat, 17 Sep 2016 12:50:48 +0000 (12:50 +0000)
		1	2
deploy/scenario/ha_nfv-ovs_heat_ceilometer_scenario.yaml	patch \|	diff1 \|	diff2 \|	blob \| history
deploy/scenario/no-ha_nfv-ovs_heat_ceilometer_scenario.yaml	patch \|	diff1 \|	diff2 \|	blob \| history