Michael Crosby
|
f4cf808a3d
|
Merge branch 'master' into api
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Conflicts:
MAINTAINERS
cgroups/cgroups.go
cgroups/fs/apply_raw.go
cgroups/fs/notify_linux.go
cgroups/fs/notify_linux_test.go
cgroups/systemd/apply_systemd.go
config.go
configs/config_test.go
console/console.go
integration/exec_test.go
integration/init_test.go
integration/template_test.go
integration/utils_test.go
linux_notify.go
linux_notify_test.go
mount/init.go
mount/mount_config.go
mount/pivotroot.go
mount/ptmx.go
namespaces/create.go
namespaces/exec.go
namespaces/execin.go
namespaces/init.go
namespaces/nsenter/nsenter.c
namespaces/nsenter/nsenter.go
namespaces/utils.go
network/network.go
network/types.go
network/veth.go
notify_linux.go
notify_linux_test.go
nsinit/exec.go
nsinit/main.go
nsinit/nsenter.go
nsinit/oom.go
sample_configs/host-pid.json
sample_configs/userns.json
security/capabilities/capabilities.go
update-vendor.sh
|
2015-02-16 15:09:42 -08:00 |
|
Michael Crosby
|
5fc19e8db5
|
Rename Fs fields to fs
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
|
2015-02-11 11:20:08 -08:00 |
Andrey Vagin
|
bcd0222be5
|
api: fix config tests
Signed-off-by: Andrey Vagin <avagin@openvz.org>
|
2015-02-03 10:00:21 -08:00 |
|
Andrey Vagin
|
ca633b2f29
|
Merge remote-tracking branch 'origin/master' into api
Signed-off-by: Andrey Vagin <avagin@openvz.org>
|
2015-01-28 14:37:40 +03:00 |
|
Michael Crosby
|
2d9ef3af72
|
Add config for running a container in host pid ns
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
|
2015-01-12 10:29:41 -08:00 |