Merge pull request #3963 from brauner/2021-09-03.build

author Stéphane Graber <stgraber@ubuntu.com>

Wed, 15 Sep 2021 02:41:55 +0000 (22:41 -0400)

committer GitHub <noreply@github.com>

Wed, 15 Sep 2021 02:41:55 +0000 (22:41 -0400)
author Stéphane Graber <stgraber@ubuntu.com>
Wed, 15 Sep 2021 02:41:55 +0000 (22:41 -0400)
committer GitHub <noreply@github.com>
Wed, 15 Sep 2021 02:41:55 +0000 (22:41 -0400)
diff --cc configure.ac
Simple merge
diff --cc src/lxc/log.h
Simple merge
author	Stéphane Graber <stgraber@ubuntu.com>
	Wed, 15 Sep 2021 02:41:55 +0000 (22:41 -0400)
committer	GitHub <noreply@github.com>
	Wed, 15 Sep 2021 02:41:55 +0000 (22:41 -0400)
		1	2
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history
src/lxc/log.h	patch \|	diff1 \|	diff2 \|	blob \| history