Guillaume J. Charmes 1f519be2f8 Merge remote-tracking branch 'mike/add-netlink-functions' into implement_create_veth ...

Conflicts:
	pkg/netlink/netlink_linux.go

Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com> (github: creack)
Upstream-commit: dce7b6a69c42fb64a99f873a5f7568799228c1e5
Component: engine

2014-02-12 04:17:12 -08:00

components/engine

Merge remote-tracking branch 'mike/add-netlink-functions' into implement_create_veth

2014-02-12 04:17:12 -08:00

Description

No description provided

310 MiB

Languages

Go 92%

Shell 5.5%

Dockerfile 1.1%

Go-Checksums 0.9%

Makefile 0.3%

Other 0.2%