Michael Crosby f5030a0a05 Merge branch 'selinux' of https://github.com/rhatdan/docker into rhatdan-selinux ...

Conflicts:
	pkg/selinux/selinux.go
	runtime/execdriver/lxc/lxc_template.go

Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 6e7a93628b924d176a9caa1164db7a1526dbe573
Component: engine

2014-04-02 16:11:35 +00:00

components/engine

Merge branch 'selinux' of https://github.com/rhatdan/docker into rhatdan-selinux

2014-04-02 16:11:35 +00: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%