Merge pull request #1705 from brauner/2017-07-15/fix_clone

author Serge Hallyn <serge@hallyn.com>

Wed, 2 Aug 2017 17:30:06 +0000 (12:30 -0500)

committer GitHub <noreply@github.com>

Wed, 2 Aug 2017 17:30:06 +0000 (12:30 -0500)
author Serge Hallyn <serge@hallyn.com>
Wed, 2 Aug 2017 17:30:06 +0000 (12:30 -0500)
committer GitHub <noreply@github.com>
Wed, 2 Aug 2017 17:30:06 +0000 (12:30 -0500)
diff --cc src/lxc/Makefile.am
Simple merge
diff --cc src/lxc/conf.c
Simple merge
diff --cc src/lxc/start.c
Simple merge
author	Serge Hallyn <serge@hallyn.com>
	Wed, 2 Aug 2017 17:30:06 +0000 (12:30 -0500)
committer	GitHub <noreply@github.com>
	Wed, 2 Aug 2017 17:30:06 +0000 (12:30 -0500)
		1	2
src/lxc/Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history
src/lxc/conf.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/lxc/start.c	patch \|	diff1 \|	diff2 \|	blob \| history