]> git.ipfire.org Git - thirdparty/lxc.git/commitdiff
Merge pull request #2035 from adrianreber/master
authorChristian Brauner <christian.brauner@ubuntu.com>
Thu, 14 Dec 2017 20:06:17 +0000 (21:06 +0100)
committerGitHub <noreply@github.com>
Thu, 14 Dec 2017 20:06:17 +0000 (21:06 +0100)
criu: add feature check capability

1  2 
src/lxc/criu.c
src/lxc/lxccontainer.c

diff --cc src/lxc/criu.c
Simple merge
Simple merge