projects
/
systemd
/
.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
bb08b2a
e2d5aab
)
Merge pull request #13006 from yuwata/network-split-dhcp-12917
author
Lennart Poettering
<lennart@poettering.net>
Thu, 11 Jul 2019 08:28:03 +0000
(10:28 +0200)
committer
GitHub
<noreply@github.com>
Thu, 11 Jul 2019 08:28:03 +0000
(10:28 +0200)
networkd: DHCPv6 - separate DHCPv6 options from DHCPv4 options
1
2
man/systemd.network.xml
patch
|
diff1
|
diff2
|
blob
|
history
src/network/networkd-link.c
patch
|
diff1
|
diff2
|
blob
|
history
src/network/networkd-network-gperf.gperf
patch
|
diff1
|
diff2
|
blob
|
history
src/network/networkd-network.c
patch
|
diff1
|
diff2
|
blob
|
history
src/network/networkd-network.h
patch
|
diff1
|
diff2
|
blob
|
history
test/fuzz/fuzz-network-parser/directives.network
patch
|
diff1
|
diff2
|
blob
|
history
test/test-network/systemd-networkd-tests.py
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
man/systemd.network.xml
Simple merge
diff --cc
src/network/networkd-link.c
Simple merge
diff --cc
src/network/networkd-network-gperf.gperf
Simple merge
diff --cc
src/network/networkd-network.c
Simple merge
diff --cc
src/network/networkd-network.h
Simple merge
diff --cc
test/fuzz/fuzz-network-parser/directives.network
Simple merge
diff --cc
test/test-network/systemd-networkd-tests.py
Simple merge