Merge "VPP: Make script inclusion more readable"

author Vanessa Rene Valderrama <[email protected]>

Mon, 13 Jan 2020 13:02:05 +0000 (13:02 +0000)

committer Gerrit Code Review <[email protected]>

Mon, 13 Jan 2020 13:02:05 +0000 (13:02 +0000)
author Vanessa Rene Valderrama <[email protected]>
Mon, 13 Jan 2020 13:02:05 +0000 (13:02 +0000)
committer Gerrit Code Review <[email protected]>
Mon, 13 Jan 2020 13:02:05 +0000 (13:02 +0000)
diff --cc jjb/vpp/docs.yaml
Simple merge
diff --cc jjb/vpp/vpp.yaml
Simple merge
author	Vanessa Rene Valderrama <[email protected]>
	Mon, 13 Jan 2020 13:02:05 +0000 (13:02 +0000)
committer	Gerrit Code Review <[email protected]>
	Mon, 13 Jan 2020 13:02:05 +0000 (13:02 +0000)
		1	2
jjb/vpp/docs.yaml	patch \|	diff1 \|	diff2 \|	blob \| history
jjb/vpp/vpp.yaml	patch \|	diff1 \|	diff2 \|	blob \| history