systemd: merge branch 'systemd-integration' into master
authorThomas Haller <thaller@redhat.com>
Wed, 16 Sep 2015 14:53:25 +0000 (16:53 +0200)
committerThomas Haller <thaller@redhat.com>
Wed, 16 Sep 2015 14:54:03 +0000 (16:54 +0200)
commitc05557971c09782316ee7e39ae4e7a7675d338f1
tree25595e64bb7f900b17766270b52e7696d4e615c7
parent08916936bce4c8ac36156c040999add99175b455
parente82f430eae841032c7961d2eca694435425e4d51
systemd: merge branch 'systemd-integration' into master
34 files changed:
src/Makefile.am
src/dhcp-manager/nm-dhcp-systemd.c
src/systemd/src/basic/hostname-util.c
src/systemd/src/basic/hostname-util.h
src/systemd/src/basic/macro.h
src/systemd/src/basic/refcnt.h
src/systemd/src/basic/strv.c
src/systemd/src/basic/strv.h
src/systemd/src/basic/time-util.c
src/systemd/src/basic/time-util.h
src/systemd/src/basic/util.c
src/systemd/src/basic/util.h
src/systemd/src/libsystemd-network/dhcp-identifier.c
src/systemd/src/libsystemd-network/dhcp-internal.h
src/systemd/src/libsystemd-network/dhcp-lease-internal.h
src/systemd/src/libsystemd-network/dhcp-option.c
src/systemd/src/libsystemd-network/dhcp-protocol.h
src/systemd/src/libsystemd-network/dhcp6-internal.h
src/systemd/src/libsystemd-network/dhcp6-lease-internal.h
src/systemd/src/libsystemd-network/dhcp6-network.c
src/systemd/src/libsystemd-network/dhcp6-option.c
src/systemd/src/libsystemd-network/dhcp6-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-client.c
src/systemd/src/libsystemd-network/sd-dhcp-lease.c
src/systemd/src/libsystemd-network/sd-dhcp6-client.c
src/systemd/src/libsystemd-network/sd-dhcp6-lease.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
src/systemd/src/systemd/sd-dhcp6-lease.h
src/systemd/src/systemd/sd-icmp6-nd.h