git.ipfire.org Git - thirdparty/systemd.git/commit

]> git.ipfire.org Git - thirdparty/systemd.git/commit

projects / thirdparty / systemd.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: f0a43eb 707b3fb)

author	Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
	Thu, 6 Dec 2018 16:19:21 +0000 (17:19 +0100)
committer	Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
	Thu, 6 Dec 2018 16:19:21 +0000 (17:19 +0100)
commit	871fa294ff38b7fc0df7ddc2b03ec781d9f0cb8a
tree	e6832d12fd4f4a8120656ab07491cd0eb70de665	tree \| snapshot
parent	f0a43eb821e7b6952977a92cd2ce8a2575f7101a	commit \| diff
parent	707b3fbd5732c630d1fd0bab6f6e5b8f7130b322	commit \| diff

Merge pull request #10935 from poettering/rlimit-nofile-safe

Merged by hand to resolve a trivial conflict in TODO.

TODO	diff1 \|	diff2 \|	blob \| history
src/basic/meson.build	diff1 \|	diff2 \|	blob \| history
src/basic/process-util.c	diff1 \|	diff2 \|	blob \| history
src/coredump/coredumpctl.c	diff1 \|	diff2 \|	blob \| history
src/login/inhibit.c	diff1 \|	diff2 \|	blob \| history
src/machine/image-dbus.c	diff1 \|	diff2 \|	blob \| history
src/shared/exec-util.c	diff1 \|	diff2 \|	blob \| history
src/shared/meson.build	diff1 \|	diff2 \|	blob \| history
src/systemctl/systemctl.c	diff1 \|	diff2 \|	blob \| history
src/udev/udev-event.c	diff1 \|	diff2 \|	blob \| history
src/vconsole/vconsole-setup.c	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.