Merge "Apex: increase build timeout"

author Tim Rozet <trozet@redhat.com>

Thu, 25 May 2017 20:19:02 +0000 (20:19 +0000)

committer Gerrit Code Review <gerrit@opnfv.org>

Thu, 25 May 2017 20:19:02 +0000 (20:19 +0000)
author Tim Rozet <trozet@redhat.com>
Thu, 25 May 2017 20:19:02 +0000 (20:19 +0000)
committer Gerrit Code Review <gerrit@opnfv.org>
Thu, 25 May 2017 20:19:02 +0000 (20:19 +0000)
diff --cc jjb/apex/apex.yml
Simple merge
diff --cc jjb/apex/apex.yml.j2
Simple merge
author	Tim Rozet <trozet@redhat.com>
	Thu, 25 May 2017 20:19:02 +0000 (20:19 +0000)
committer	Gerrit Code Review <gerrit@opnfv.org>
	Thu, 25 May 2017 20:19:02 +0000 (20:19 +0000)
		1	2
jjb/apex/apex.yml	patch \|	diff1 \|	diff2 \|	blob \| history
jjb/apex/apex.yml.j2	patch \|	diff1 \|	diff2 \|	blob \| history