Merge pull request #12555 from ssahani/route-properties

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

Tue, 14 May 2019 07:03:52 +0000 (09:03 +0200)

committer GitHub <noreply@github.com>

Tue, 14 May 2019 07:03:52 +0000 (09:03 +0200)
author Yu Watanabe <watanabe.yu+github@gmail.com>
Tue, 14 May 2019 07:03:52 +0000 (09:03 +0200)
committer GitHub <noreply@github.com>
Tue, 14 May 2019 07:03:52 +0000 (09:03 +0200)
diff --cc man/systemd.network.xml
Simple merge
diff --cc src/network/networkd-network-gperf.gperf
Simple merge
diff --cc test/fuzz/fuzz-network-parser/directives.network
Simple merge
author	Yu Watanabe <watanabe.yu+github@gmail.com>
	Tue, 14 May 2019 07:03:52 +0000 (09:03 +0200)
committer	GitHub <noreply@github.com>
	Tue, 14 May 2019 07:03:52 +0000 (09:03 +0200)
		1	2
man/systemd.network.xml	patch \|	diff1 \|	diff2 \|	blob \| history
src/network/networkd-network-gperf.gperf	patch \|	diff1 \|	diff2 \|	blob \| history
test/fuzz/fuzz-network-parser/directives.network	patch \|	diff1 \|	diff2 \|	blob \| history