projects
/
NetworkManager.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
f29d901
a558dc9
)
systemd: merge branch systemd into master
author
Thomas Haller
<thaller@redhat.com>
Tue, 22 Mar 2016 12:57:47 +0000
(13:57 +0100)
committer
Thomas Haller
<thaller@redhat.com>
Tue, 22 Mar 2016 13:03:39 +0000
(14:03 +0100)
Update systemd code from upstream. In the meantime, two
patches that we applied early in NetworkManager core were
applied in upstream systemd too. So, resync.
1
2
src/systemd/src/basic/log.h
patch
|
diff1
|
diff2
|
blob
|
history
src/systemd/src/basic/macro.h
patch
|
diff1
|
diff2
|
blob
|
history
src/systemd/src/basic/util.h
patch
|
diff1
|
diff2
|
blob
|
history
src/systemd/src/libsystemd-network/lldp-neighbor.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
src/systemd/src/basic/log.h
Simple merge
diff --cc
src/systemd/src/basic/macro.h
Simple merge
diff --cc
src/systemd/src/basic/util.h
Simple merge
diff --cc
src/systemd/src/libsystemd-network/lldp-neighbor.c
Simple merge