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

Browse Source

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)

...

This commit is contained in:

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

parent 89db8365b8 476a799914

commit 8e3e23d5ef

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available