systemd: merge branch 'systemd' into master
authorBeniamino Galvani <bgalvani@redhat.com>
Mon, 23 Nov 2015 15:13:45 +0000 (16:13 +0100)
committerBeniamino Galvani <bgalvani@redhat.com>
Mon, 23 Nov 2015 15:18:10 +0000 (16:18 +0100)
commitaa22b2d87f28ed491fec3f1b40fc9d7b3042b926
tree319c0191245212a79d6a10d8b2bb8e3aa3249721
parentb8c2fc26c12d4732d112237c8210fef4255c43e7
parentaa9d0d1467ae3569b7c3161cabda2cbe62056526
systemd: merge branch 'systemd' into master
87 files changed:
src/Makefile.am
src/dhcp-manager/nm-dhcp-systemd.c
src/systemd/nm-sd-adapt.c
src/systemd/src/basic/alloc-util.c
src/systemd/src/basic/alloc-util.h
src/systemd/src/basic/escape.c
src/systemd/src/basic/escape.h
src/systemd/src/basic/fd-util.c
src/systemd/src/basic/fd-util.h
src/systemd/src/basic/fileio.c
src/systemd/src/basic/fileio.h
src/systemd/src/basic/fs-util.c
src/systemd/src/basic/fs-util.h
src/systemd/src/basic/hashmap.c
src/systemd/src/basic/hexdecoct.c
src/systemd/src/basic/hexdecoct.h
src/systemd/src/basic/hostname-util.c
src/systemd/src/basic/in-addr-util.c
src/systemd/src/basic/io-util.c
src/systemd/src/basic/io-util.h
src/systemd/src/basic/log.h
src/systemd/src/basic/macro.h
src/systemd/src/basic/mempool.c
src/systemd/src/basic/parse-util.c
src/systemd/src/basic/parse-util.h
src/systemd/src/basic/path-util.c
src/systemd/src/basic/path-util.h
src/systemd/src/basic/prioq.c
src/systemd/src/basic/random-util.c
src/systemd/src/basic/siphash24.c
src/systemd/src/basic/siphash24.h
src/systemd/src/basic/socket-util.h
src/systemd/src/basic/string-table.c
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/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/umask-util.h
src/systemd/src/basic/unaligned.h
src/systemd/src/basic/utf8.c
src/systemd/src/basic/util.c
src/systemd/src/basic/util.h
src/systemd/src/libsystemd-network/arp-util.c
src/systemd/src/libsystemd-network/arp-util.h
src/systemd/src/libsystemd-network/dhcp-identifier.c
src/systemd/src/libsystemd-network/dhcp-identifier.h
src/systemd/src/libsystemd-network/dhcp-internal.h
src/systemd/src/libsystemd-network/dhcp-lease-internal.h
src/systemd/src/libsystemd-network/dhcp-network.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-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/lldp-internal.c
src/systemd/src/libsystemd-network/lldp-internal.h
src/systemd/src/libsystemd-network/lldp-network.c
src/systemd/src/libsystemd-network/lldp-port.c
src/systemd/src/libsystemd-network/lldp-tlv.c
src/systemd/src/libsystemd-network/lldp-tlv.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-ipv4acd.c
src/systemd/src/libsystemd-network/sd-ipv4ll.c
src/systemd/src/libsystemd-network/sd-lldp.c
src/systemd/src/libsystemd/sd-event/event-util.h
src/systemd/src/libsystemd/sd-id128/sd-id128.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
src/systemd/src/systemd/sd-dhcp6-lease.h
src/systemd/src/systemd/sd-event.h
src/systemd/src/systemd/sd-ipv4acd.h
src/systemd/src/systemd/sd-ipv4ll.h
src/systemd/src/systemd/sd-lldp.h
src/systemd/src/systemd/sd-ndisc.h