Merge "Adding python tests and updating for conventions"

author Dan Radez <dradez@redhat.com>

Tue, 31 May 2016 12:21:09 +0000 (12:21 +0000)

committer Gerrit Code Review <gerrit@172.30.200.206>

Tue, 31 May 2016 12:21:09 +0000 (12:21 +0000)
author Dan Radez <dradez@redhat.com>
Tue, 31 May 2016 12:21:09 +0000 (12:21 +0000)
committer Gerrit Code Review <gerrit@172.30.200.206>
Tue, 31 May 2016 12:21:09 +0000 (12:21 +0000)
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:21:09 +0000 (12:21 +0000)
committer	Gerrit Code Review <gerrit@172.30.200.206>
	Tue, 31 May 2016 12:21:09 +0000 (12:21 +0000)
		1	2
ci/deploy.sh	patch \|	diff1 \|	diff2 \|	blob \| history
lib/common-functions.sh	patch \|	diff1 \|	diff2 \|	blob \| history