]> git.ipfire.org Git - thirdparty/systemd.git/commit
Merge pull request #16596 from poettering/event-time-rel
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Tue, 4 Aug 2020 14:07:03 +0000 (16:07 +0200)
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Tue, 4 Aug 2020 14:07:03 +0000 (16:07 +0200)
commitd06bd2e78535de895c540b98d5d5907b85d32a09
tree57ebb6c869ebd25ed3224e67129601fbda3ac418
parent1472b588355584f9a6a164c91b28609c1b2822de
parentf6ad6248e886fe345150460ef89ebf2c6c7a1c7f
Merge pull request #16596 from  poettering/event-time-rel

Conflict in src/libsystemd-network/test-ndisc-rs.c fixed manually.
TODO
src/libsystemd-network/test-dhcp6-client.c
src/libsystemd-network/test-ndisc-rs.c
src/timesync/timesyncd-manager.c