systemd: merge branch 'systemd' into master
authorThomas Haller <thaller@redhat.com>
Wed, 12 Aug 2015 10:53:13 +0000 (12:53 +0200)
committerThomas Haller <thaller@redhat.com>
Wed, 12 Aug 2015 10:54:05 +0000 (12:54 +0200)
commitedb0cc235a1bb51df3ad6a979b493348138e57af
treeb84ee3ca3f6ac35205913a6dadc7b5e8da68af26
parent3ae6f9d793d8af24d168344ea0e3fb2cef47af54
parent8f4e6175268689575b84ef12821b1d293b68d4c5
systemd: merge branch 'systemd' into master
20 files changed:
src/dhcp-manager/nm-dhcp-systemd.c
src/systemd/src/basic/fileio.c
src/systemd/src/basic/fileio.h
src/systemd/src/basic/hostname-util.c
src/systemd/src/basic/hostname-util.h
src/systemd/src/basic/list.h
src/systemd/src/basic/macro.h
src/systemd/src/basic/path-util.c
src/systemd/src/basic/util.c
src/systemd/src/basic/util.h
src/systemd/src/libsystemd-network/dhcp-lease-internal.h
src/systemd/src/libsystemd-network/dhcp-protocol.h
src/systemd/src/libsystemd-network/network-internal.c
src/systemd/src/libsystemd-network/network-internal.h
src/systemd/src/libsystemd-network/sd-dhcp-lease.c
src/systemd/src/libsystemd-network/sd-dhcp6-client.c
src/systemd/src/libsystemd-network/sd-ipv4ll.c
src/systemd/src/shared/dns-domain.c
src/systemd/src/shared/dns-domain.h
src/systemd/src/systemd/sd-dhcp-lease.h