Merge pull request #11883 from yuwata/network-dhcp-renew

author Yu Watanabe <watanabe.yu+github@gmail.com>

Sun, 22 Sep 2019 05:44:23 +0000 (07:44 +0200)

committer GitHub <noreply@github.com>

Sun, 22 Sep 2019 05:44:23 +0000 (07:44 +0200)
author Yu Watanabe <watanabe.yu+github@gmail.com>
Sun, 22 Sep 2019 05:44:23 +0000 (07:44 +0200)
committer GitHub <noreply@github.com>
Sun, 22 Sep 2019 05:44:23 +0000 (07:44 +0200)
diff --cc src/network/networkctl.c
Simple merge
diff --cc src/network/org.freedesktop.network1.policy
Simple merge
diff --cc src/systemd/sd-dhcp-client.h
Simple merge
author	Yu Watanabe <watanabe.yu+github@gmail.com>
	Sun, 22 Sep 2019 05:44:23 +0000 (07:44 +0200)
committer	GitHub <noreply@github.com>
	Sun, 22 Sep 2019 05:44:23 +0000 (07:44 +0200)
		1	2
src/network/networkctl.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/network/org.freedesktop.network1.policy	patch \|	diff1 \|	diff2 \|	blob \| history
src/systemd/sd-dhcp-client.h	patch \|	diff1 \|	diff2 \|	blob \| history