systemd: merge branch 'systemd' into master
authorThomas Haller <thaller@redhat.com>
Tue, 26 Jan 2016 16:22:54 +0000 (17:22 +0100)
committerThomas Haller <thaller@redhat.com>
Tue, 26 Jan 2016 16:45:23 +0000 (17:45 +0100)
commitacc0d792244ded70ce41ced564abb0fe0b087fff
tree254b98bf73eac946c985c28e4a00ccbc19bdff3c
parentea112ed8213268617c8caa8432fdb051d8acdbda
parent14912429cc25a7f58e073101d1dd68690dc1ed59
systemd: merge branch 'systemd' into master
40 files changed:
src/Makefile.am
src/dhcp-manager/nm-dhcp-systemd.c
src/systemd/src/basic/escape.c
src/systemd/src/basic/escape.h
src/systemd/src/basic/fd-util.h
src/systemd/src/basic/fileio.c
src/systemd/src/basic/fs-util.c
src/systemd/src/basic/hash-funcs.c
src/systemd/src/basic/hash-funcs.h
src/systemd/src/basic/hashmap.c
src/systemd/src/basic/hashmap.h
src/systemd/src/basic/in-addr-util.c
src/systemd/src/basic/in-addr-util.h
src/systemd/src/basic/log.h
src/systemd/src/basic/macro.h
src/systemd/src/basic/parse-util.c
src/systemd/src/basic/path-util.c
src/systemd/src/basic/siphash24.h
src/systemd/src/basic/socket-util.h
src/systemd/src/basic/stdio-util.h
src/systemd/src/basic/string-table.h
src/systemd/src/basic/string-util.c
src/systemd/src/basic/string-util.h
src/systemd/src/basic/util.c
src/systemd/src/libsystemd-network/dhcp-option.c
src/systemd/src/libsystemd-network/dhcp-packet.c
src/systemd/src/libsystemd-network/dhcp-protocol.h
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/shared/dns-domain.c
src/systemd/src/shared/dns-domain.h
src/systemd/src/systemd/sd-dhcp-client.h
src/systemd/src/systemd/sd-dhcp-lease.h
src/systemd/src/systemd/sd-dhcp6-client.h