Merge "dep updates related to removing openstack-tripleo"

author Tim Rozet <trozet@redhat.com>

Thu, 18 May 2017 20:22:50 +0000 (20:22 +0000)

committer Gerrit Code Review <gerrit@opnfv.org>

Thu, 18 May 2017 20:22:50 +0000 (20:22 +0000)
author Tim Rozet <trozet@redhat.com>
Thu, 18 May 2017 20:22:50 +0000 (20:22 +0000)
committer Gerrit Code Review <gerrit@opnfv.org>
Thu, 18 May 2017 20:22:50 +0000 (20:22 +0000)
diff --cc build/Makefile
Simple merge
diff --cc build/rpm_specs/opnfv-apex-common.spec
Simple merge
author	Tim Rozet <trozet@redhat.com>
	Thu, 18 May 2017 20:22:50 +0000 (20:22 +0000)
committer	Gerrit Code Review <gerrit@opnfv.org>
	Thu, 18 May 2017 20:22:50 +0000 (20:22 +0000)
		1	2
build/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
build/rpm_specs/opnfv-apex-common.spec	patch \|	diff1 \|	diff2 \|	blob \| history