Merge "fixes for docs-build.sh migration"

author Aric Gardner <agardner@linuxfoundation.org>

Thu, 14 Jul 2016 15:30:54 +0000 (15:30 +0000)

committer Gerrit Code Review <gerrit@172.30.200.206>

Thu, 14 Jul 2016 15:30:54 +0000 (15:30 +0000)
author Aric Gardner <agardner@linuxfoundation.org>
Thu, 14 Jul 2016 15:30:54 +0000 (15:30 +0000)
committer Gerrit Code Review <gerrit@172.30.200.206>
Thu, 14 Jul 2016 15:30:54 +0000 (15:30 +0000)
diff --cc jjb/releng-macros.yaml
Simple merge
diff --cc jjb/yardstick/yardstick-project-jobs.yml
Simple merge
author	Aric Gardner <agardner@linuxfoundation.org>
	Thu, 14 Jul 2016 15:30:54 +0000 (15:30 +0000)
committer	Gerrit Code Review <gerrit@172.30.200.206>
	Thu, 14 Jul 2016 15:30:54 +0000 (15:30 +0000)
		1	2
jjb/releng-macros.yaml	patch \|	diff1 \|	diff2 \|	blob \| history
jjb/yardstick/yardstick-project-jobs.yml	patch \|	diff1 \|	diff2 \|	blob \| history