Merge pull request #2030 from brauner/2017-12-13/fix_cgroup_namsepace_recording

author Serge Hallyn <serge@hallyn.com>

Thu, 14 Dec 2017 06:45:52 +0000 (00:45 -0600)

committer GitHub <noreply@github.com>

Thu, 14 Dec 2017 06:45:52 +0000 (00:45 -0600)
author Serge Hallyn <serge@hallyn.com>
Thu, 14 Dec 2017 06:45:52 +0000 (00:45 -0600)
committer GitHub <noreply@github.com>
Thu, 14 Dec 2017 06:45:52 +0000 (00:45 -0600)
diff --cc src/lxc/criu.c
Simple merge
diff --cc src/lxc/start.c
Simple merge
diff --cc src/lxc/start.h
Simple merge
author	Serge Hallyn <serge@hallyn.com>
	Thu, 14 Dec 2017 06:45:52 +0000 (00:45 -0600)
committer	GitHub <noreply@github.com>
	Thu, 14 Dec 2017 06:45:52 +0000 (00:45 -0600)
		1	2
src/lxc/criu.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/lxc/start.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/lxc/start.h	patch \|	diff1 \|	diff2 \|	blob \| history