systemd: merge branch systemd into th/systemd-lldp-bgo763384
authorThomas Haller <thaller@redhat.com>
Mon, 29 Feb 2016 13:30:15 +0000 (14:30 +0100)
committerThomas Haller <thaller@redhat.com>
Fri, 11 Mar 2016 08:28:10 +0000 (09:28 +0100)
commit18133ea1428648781dba74c26dd5d118e8d5ce33
tree76f9be4e4e0f871dbedd2f096db118ae11189b11
parentd432edba558e0eacee9f64b6038ef11cb88b77a4
parentbccb4e358c218815c5dd599243871ef777e8ef6e
systemd: merge branch systemd into th/systemd-lldp-bgo763384

As the lldp API changed, adjust "nm-lldp-listener.c".

Note that the commit is not yet functional due to missing
sd_event_source_set_enabled() and sd_event_source_set_time().
38 files changed:
src/Makefile.am
src/devices/nm-device.c
src/devices/nm-lldp-listener.c
src/devices/nm-lldp-listener.h
src/devices/tests/test-lldp.c
src/systemd/nm-sd-adapt.c
src/systemd/nm-sd-adapt.h
src/systemd/src/basic/escape.c
src/systemd/src/basic/escape.h
src/systemd/src/basic/ether-addr-util.c
src/systemd/src/basic/fileio.c
src/systemd/src/basic/fs-util.c
src/systemd/src/basic/hashmap.c
src/systemd/src/basic/hexdecoct.c
src/systemd/src/basic/hostname-util.c
src/systemd/src/basic/io-util.c
src/systemd/src/basic/log.h
src/systemd/src/basic/macro.h
src/systemd/src/basic/parse-util.c
src/systemd/src/basic/socket-util.c
src/systemd/src/basic/string-util.c
src/systemd/src/basic/strv.c
src/systemd/src/basic/time-util.c
src/systemd/src/basic/utf8.c
src/systemd/src/basic/util.h
src/systemd/src/libsystemd-network/dhcp-option.c
src/systemd/src/libsystemd-network/dhcp-packet.c
src/systemd/src/libsystemd-network/dhcp6-option.c
src/systemd/src/libsystemd-network/lldp-neighbor.c
src/systemd/src/libsystemd-network/lldp-network.c
src/systemd/src/libsystemd-network/network-internal.c
src/systemd/src/libsystemd-network/sd-dhcp-client.c
src/systemd/src/libsystemd-network/sd-dhcp6-client.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/shared/dns-domain.c
src/tests/test-systemd.c