Merge "Adds licenses and fixes ODL L3"

author Dan Radez <dradez@redhat.com>

Sat, 23 Jan 2016 03:37:43 +0000 (03:37 +0000)

committer Gerrit Code Review <gerrit@172.30.200.206>

Sat, 23 Jan 2016 03:37:43 +0000 (03:37 +0000)
author Dan Radez <dradez@redhat.com>
Sat, 23 Jan 2016 03:37:43 +0000 (03:37 +0000)
committer Gerrit Code Review <gerrit@172.30.200.206>
Sat, 23 Jan 2016 03:37:43 +0000 (03:37 +0000)
diff --cc build/instack.sh
Simple merge
diff --cc ci/deploy.sh
Simple merge
author	Dan Radez <dradez@redhat.com>
	Sat, 23 Jan 2016 03:37:43 +0000 (03:37 +0000)
committer	Gerrit Code Review <gerrit@172.30.200.206>
	Sat, 23 Jan 2016 03:37:43 +0000 (03:37 +0000)
		1	2
build/instack.sh	patch \|	diff1 \|	diff2 \|	blob \| history
ci/deploy.sh	patch \|	diff1 \|	diff2 \|	blob \| history