systemd: merge branch 'systemd' into master

System Internals / NetworkManager - Thomas Haller [redhat.com] - 12 August 2015 05:54 UTC

edb0cc2 systemd: merge branch 'systemd' into master

src/dhcp-manager/nm-dhcp-systemd.c | 9 +-
src/systemd/src/basic/fileio.c | 106 ++--
src/systemd/src/basic/fileio.h | 14 +-
src/systemd/src/basic/hostname-util.c | 37 +-
src/systemd/src/basic/hostname-util.h | 4 +-
src/systemd/src/basic/list.h | 26 +
src/systemd/src/basic/macro.h | 21 +-
src/systemd/src/basic/path-util.c | 8 +-
src/systemd/src/basic/util.c | 664 +++++++++++++++++++-
src/systemd/src/basic/util.h | 26 +-
.../src/libsystemd-network/dhcp-lease-internal.h | 14 +-
src/systemd/src/libsystemd-network/dhcp-protocol.h | 2 +
.../src/libsystemd-network/network-internal.c | 27 +
.../src/libsystemd-network/network-internal.h | 3 +
src/systemd/src/libsystemd-network/sd-dhcp-lease.c | 229 +++++--
.../src/libsystemd-network/sd-dhcp6-client.c | 11 +-
src/systemd/src/libsystemd-network/sd-ipv4ll.c | 5 +-
src/systemd/src/shared/dns-domain.c | 95 ++-
src/systemd/src/shared/dns-domain.h | 2 +
src/systemd/src/systemd/sd-dhcp-lease.h | 3 +-
20 files changed, 1122 insertions(+), 184 deletions(-)

Upstream: cgit.freedesktop.org

  • Share