Merge pull request #1592 from brauner/2017-05-28/idmap_handling

author Serge Hallyn <serge@hallyn.com>

Thu, 1 Jun 2017 22:29:55 +0000 (17:29 -0500)

committer GitHub <noreply@github.com>

Thu, 1 Jun 2017 22:29:55 +0000 (17:29 -0500)
author Serge Hallyn <serge@hallyn.com>
Thu, 1 Jun 2017 22:29:55 +0000 (17:29 -0500)
committer GitHub <noreply@github.com>
Thu, 1 Jun 2017 22:29:55 +0000 (17:29 -0500)
diff --cc src/lxc/conf.c
Simple merge
diff --cc src/lxc/utils.c
Simple merge
diff --cc src/lxc/utils.h
Simple merge
author	Serge Hallyn <serge@hallyn.com>
	Thu, 1 Jun 2017 22:29:55 +0000 (17:29 -0500)
committer	GitHub <noreply@github.com>
	Thu, 1 Jun 2017 22:29:55 +0000 (17:29 -0500)
		1	2
src/lxc/conf.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/lxc/utils.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/lxc/utils.h	patch \|	diff1 \|	diff2 \|	blob \| history