Merge "To enable odl_l3 and l2gw feature work together"

author Jamo Luhrsen <jluhrsen@redhat.com>

Fri, 7 Apr 2017 21:27:06 +0000 (21:27 +0000)

committer Gerrit Code Review <gerrit@opendaylight.org>

Fri, 7 Apr 2017 21:27:06 +0000 (21:27 +0000)
author Jamo Luhrsen <jluhrsen@redhat.com>
Fri, 7 Apr 2017 21:27:06 +0000 (21:27 +0000)
committer Gerrit Code Review <gerrit@opendaylight.org>
Fri, 7 Apr 2017 21:27:06 +0000 (21:27 +0000)
diff --cc jjb/integration/include-raw-integration-deploy-openstack-run-test.sh
Simple merge
diff --cc jjb/releng-defaults.yaml
Simple merge
author	Jamo Luhrsen <jluhrsen@redhat.com>
	Fri, 7 Apr 2017 21:27:06 +0000 (21:27 +0000)
committer	Gerrit Code Review <gerrit@opendaylight.org>
	Fri, 7 Apr 2017 21:27:06 +0000 (21:27 +0000)
		1	2
jjb/integration/include-raw-integration-deploy-openstack-run-test.sh	patch \|	diff1 \|	diff2 \|	blob \| history
jjb/releng-defaults.yaml	patch \|	diff1 \|	diff2 \|	blob \| history