Merge "Fixes FDIO kernel settings"

author Michael Chapman <michapma@redhat.com>

Thu, 8 Sep 2016 07:07:56 +0000 (07:07 +0000)

committer Gerrit Code Review <gerrit@172.30.200.206>

Thu, 8 Sep 2016 07:07:56 +0000 (07:07 +0000)
author Michael Chapman <michapma@redhat.com>
Thu, 8 Sep 2016 07:07:56 +0000 (07:07 +0000)
committer Gerrit Code Review <gerrit@172.30.200.206>
Thu, 8 Sep 2016 07:07:56 +0000 (07:07 +0000)
diff --cc build/overcloud-full.sh
Simple merge
diff --cc lib/overcloud-deploy-functions.sh
Simple merge
author	Michael Chapman <michapma@redhat.com>
	Thu, 8 Sep 2016 07:07:56 +0000 (07:07 +0000)
committer	Gerrit Code Review <gerrit@172.30.200.206>
	Thu, 8 Sep 2016 07:07:56 +0000 (07:07 +0000)
		1	2
build/overcloud-full.sh	patch \|	diff1 \|	diff2 \|	blob \| history
lib/overcloud-deploy-functions.sh	patch \|	diff1 \|	diff2 \|	blob \| history