Merge pull request #2102 from brauner/2018-01-22/lsm_simplifications

author Serge Hallyn <serge@hallyn.com>

Mon, 29 Jan 2018 23:08:38 +0000 (17:08 -0600)

committer GitHub <noreply@github.com>

Mon, 29 Jan 2018 23:08:38 +0000 (17:08 -0600)
author Serge Hallyn <serge@hallyn.com>
Mon, 29 Jan 2018 23:08:38 +0000 (17:08 -0600)
committer GitHub <noreply@github.com>
Mon, 29 Jan 2018 23:08:38 +0000 (17:08 -0600)
diff --cc src/lxc/attach.c
Simple merge
diff --cc src/lxc/utils.h
Simple merge
author	Serge Hallyn <serge@hallyn.com>
	Mon, 29 Jan 2018 23:08:38 +0000 (17:08 -0600)
committer	GitHub <noreply@github.com>
	Mon, 29 Jan 2018 23:08:38 +0000 (17:08 -0600)
		1	2
src/lxc/attach.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/lxc/utils.h	patch \|	diff1 \|	diff2 \|	blob \| history