Merge pull request #2347 from brauner/2018-05-24/seccomp_cleanups

author Stéphane Graber <stgraber@stgraber.org>

Thu, 24 May 2018 20:57:13 +0000 (16:57 -0400)

committer GitHub <noreply@github.com>

Thu, 24 May 2018 20:57:13 +0000 (16:57 -0400)
author Stéphane Graber <stgraber@stgraber.org>
Thu, 24 May 2018 20:57:13 +0000 (16:57 -0400)
committer GitHub <noreply@github.com>
Thu, 24 May 2018 20:57:13 +0000 (16:57 -0400)
diff --cc src/lxc/lxccontainer.c
Simple merge
diff --cc src/lxc/utils.c
Simple merge
author	Stéphane Graber <stgraber@stgraber.org>
	Thu, 24 May 2018 20:57:13 +0000 (16:57 -0400)
committer	GitHub <noreply@github.com>
	Thu, 24 May 2018 20:57:13 +0000 (16:57 -0400)
		1	2
src/lxc/lxccontainer.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/lxc/utils.c	patch \|	diff1 \|	diff2 \|	blob \| history