Merge "Fix performance option handling"

author Tim Rozet <trozet@redhat.com>

Fri, 3 Jun 2016 20:29:47 +0000 (20:29 +0000)

committer Gerrit Code Review <gerrit@172.30.200.206>

Fri, 3 Jun 2016 20:29:47 +0000 (20:29 +0000)
author Tim Rozet <trozet@redhat.com>
Fri, 3 Jun 2016 20:29:47 +0000 (20:29 +0000)
committer Gerrit Code Review <gerrit@172.30.200.206>
Fri, 3 Jun 2016 20:29:47 +0000 (20:29 +0000)
diff --cc build/build_perf_image.sh
Simple merge
diff --cc ci/deploy.sh
Simple merge
author	Tim Rozet <trozet@redhat.com>
	Fri, 3 Jun 2016 20:29:47 +0000 (20:29 +0000)
committer	Gerrit Code Review <gerrit@172.30.200.206>
	Fri, 3 Jun 2016 20:29:47 +0000 (20:29 +0000)
		1	2
build/build_perf_image.sh	patch \|	diff1 \|	diff2 \|	blob \| history
ci/deploy.sh	patch \|	diff1 \|	diff2 \|	blob \| history