Merge pull request #2499 from brauner/lxc/master

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

Mon, 30 Jul 2018 18:57:23 +0000 (14:57 -0400)

committer GitHub <noreply@github.com>

Mon, 30 Jul 2018 18:57:23 +0000 (14:57 -0400)
author Stéphane Graber <stgraber@stgraber.org>
Mon, 30 Jul 2018 18:57:23 +0000 (14:57 -0400)
committer GitHub <noreply@github.com>
Mon, 30 Jul 2018 18:57:23 +0000 (14:57 -0400)
diff --cc src/lxc/conf.c
Simple merge
diff --cc src/lxc/criu.c
Simple merge
diff --cc src/lxc/utils.c
Simple merge
author	Stéphane Graber <stgraber@stgraber.org>
	Mon, 30 Jul 2018 18:57:23 +0000 (14:57 -0400)
committer	GitHub <noreply@github.com>
	Mon, 30 Jul 2018 18:57:23 +0000 (14:57 -0400)
		1	2
src/lxc/conf.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/lxc/criu.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/lxc/utils.c	patch \|	diff1 \|	diff2 \|	blob \| history