]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
projects / thirdparty / systemd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b5799ee 90fb1f0)
Merge pull request #12414 from keszybz/detect-podman
authorLennart Poettering <lennart@poettering.net>
Mon, 29 Apr 2019 17:07:24 +0000 (19:07 +0200)
committerGitHub <noreply@github.com>
Mon, 29 Apr 2019 17:07:24 +0000 (19:07 +0200)
Detect podman as separate container type

1  2 
man/systemd.unit.xml patch | diff1 | diff2 | blob | history
src/basic/virt.c patch | diff1 | diff2 | blob | history

diff --cc man/systemd.unit.xml
Simple merge
diff --cc src/basic/virt.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.