Merge "Updates to CONFIG, RESOURCES and LIB"

author Dan Radez <dradez@redhat.com>

Tue, 31 May 2016 12:20:57 +0000 (12:20 +0000)

committer Gerrit Code Review <gerrit@172.30.200.206>

Tue, 31 May 2016 12:20:57 +0000 (12:20 +0000)
author Dan Radez <dradez@redhat.com>
Tue, 31 May 2016 12:20:57 +0000 (12:20 +0000)
committer Gerrit Code Review <gerrit@172.30.200.206>
Tue, 31 May 2016 12:20:57 +0000 (12:20 +0000)
diff --cc ci/clean.sh
Simple merge
diff --cc ci/deploy.sh
Simple merge
diff --cc lib/common-functions.sh
Simple merge
author	Dan Radez <dradez@redhat.com>
	Tue, 31 May 2016 12:20:57 +0000 (12:20 +0000)
committer	Gerrit Code Review <gerrit@172.30.200.206>
	Tue, 31 May 2016 12:20:57 +0000 (12:20 +0000)
		1	2
ci/clean.sh	patch \|	diff1 \|	diff2 \|	blob \| history
ci/deploy.sh	patch \|	diff1 \|	diff2 \|	blob \| history
lib/common-functions.sh	patch \|	diff1 \|	diff2 \|	blob \| history