Merge remote-tracking branch 'upstream/master' into release/2.2.x · ligato/vpp-agent@ee4f4c9 · GitHub

Commit

Merge remote-tracking branch 'upstream/master' into release/2.2.x

Browse files

Signed-off-by: Ondrej Fabry <[email protected]>

# Conflicts:
#	CHANGELOG.md
#	Gopkg.lock
#	api/models/vpp/vpp.pb.go
#	cmd/vpp-agent/main.go
#	docker/dev/Dockerfile
#	docker/dev/linux-ifplugin.conf
#	docker/prod/Dockerfile
#	docker/prod/linux-ifplugin.conf
#	docker/prod/vpp-ifplugin.conf
#	plugins/configurator/dump.go

Loading branch information

ondrej-fabry committed Aug 9, 2019

2 parents 51c515b + 58f912a commit ee4f4c9