projects / NetworkManager.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 6edc737 8af1818)
systemd: merge branch 'systemd'
authorBeniamino Galvani <bgalvani@redhat.com>
Mon, 11 May 2015 06:44:59 +0000 (08:44 +0200)
committerBeniamino Galvani <bgalvani@redhat.com>
Mon, 11 May 2015 07:19:02 +0000 (09:19 +0200)
commit8ff2c2e93660af86d77cf3351f78ebac21a93031
treeaa6485aa2aaf25650d6cc0c1ed3bee6d02f3aa9ftree | snapshot
parent6edc7371734315d57de020193102938846b2eb9ecommit | diff
parent8af18182f3bf55270aadc83f32c518935d553a2acommit | diff
systemd: merge branch 'systemd'

In addition, update src/Makefile.am with new paths and move

  src/{dhcp-manager/systemd-dhcp => systemd}/nm-sd-adapt.[ch]

as well.
54 files changed:
src/Makefile.am diff1 | diff2 | blob | history
src/systemd/nm-sd-adapt.c diff1 | | blob | history
src/systemd/nm-sd-adapt.h diff1 | | blob | history
src/systemd/src/libsystemd-network/dhcp-identifier.c diff1 | diff2 | blob | history
src/systemd/src/libsystemd-network/dhcp-identifier.h diff1 | diff2 | blob | history
src/systemd/src/libsystemd-network/dhcp-internal.h diff1 | diff2 | blob | history
src/systemd/src/libsystemd-network/dhcp-lease-internal.h diff1 | diff2 | blob | history
src/systemd/src/libsystemd-network/dhcp-network.c diff1 | diff2 | blob | history
src/systemd/src/libsystemd-network/dhcp-option.c diff1 | diff2 | blob | history
src/systemd/src/libsystemd-network/dhcp-packet.c diff1 | diff2 | blob | history
src/systemd/src/libsystemd-network/dhcp-protocol.h diff1 | diff2 | blob | history
src/systemd/src/libsystemd-network/dhcp6-internal.h diff1 | diff2 | blob | history
src/systemd/src/libsystemd-network/dhcp6-lease-internal.h diff1 | diff2 | blob | history
src/systemd/src/libsystemd-network/dhcp6-network.c diff1 | diff2 | blob | history
src/systemd/src/libsystemd-network/dhcp6-option.c diff1 | diff2 | blob | history
src/systemd/src/libsystemd-network/dhcp6-protocol.h diff1 | diff2 | blob | history
src/systemd/src/libsystemd-network/network-internal.c diff1 | diff2 | blob | history
src/systemd/src/libsystemd-network/network-internal.h diff1 | diff2 | blob | history
src/systemd/src/libsystemd-network/sd-dhcp-client.c diff1 | diff2 | blob | history
src/systemd/src/libsystemd-network/sd-dhcp-lease.c diff1 | diff2 | blob | history
src/systemd/src/libsystemd-network/sd-dhcp6-client.c diff1 | diff2 | blob | history
src/systemd/src/libsystemd-network/sd-dhcp6-lease.c diff1 | diff2 | blob | history
src/systemd/src/libsystemd/sd-id128/sd-id128.c diff1 | diff2 | blob | history
src/systemd/src/shared/async.h diff1 | diff2 | blob | history
src/systemd/src/shared/fileio.c diff1 | diff2 | blob | history
src/systemd/src/shared/fileio.h diff1 | diff2 | blob | history
src/systemd/src/shared/in-addr-util.c diff1 | diff2 | blob | history
src/systemd/src/shared/in-addr-util.h diff1 | diff2 | blob | history
src/systemd/src/shared/list.h diff1 | diff2 | blob | history
src/systemd/src/shared/log.h diff1 | diff2 | blob | history
src/systemd/src/shared/macro.h diff1 | diff2 | blob | history
src/systemd/src/shared/path-util.c diff1 | diff2 | blob | history
src/systemd/src/shared/path-util.h diff1 | diff2 | blob | history
src/systemd/src/shared/refcnt.h diff1 | diff2 | blob | history
src/systemd/src/shared/siphash24.c diff1 | diff2 | blob | history
src/systemd/src/shared/siphash24.h diff1 | diff2 | blob | history
src/systemd/src/shared/socket-util.h diff1 | diff2 | blob | history
src/systemd/src/shared/sparse-endian.h diff1 | diff2 | blob | history
src/systemd/src/shared/strv.c diff1 | diff2 | blob | history
src/systemd/src/shared/strv.h diff1 | diff2 | blob | history
src/systemd/src/shared/time-util.c diff1 | diff2 | blob | history
src/systemd/src/shared/time-util.h diff1 | diff2 | blob | history
src/systemd/src/shared/unaligned.h diff1 | diff2 | blob | history
src/systemd/src/shared/utf8.c diff1 | diff2 | blob | history
src/systemd/src/shared/utf8.h diff1 | diff2 | blob | history
src/systemd/src/shared/util.c diff1 | diff2 | blob | history
src/systemd/src/shared/util.h diff1 | diff2 | blob | history
src/systemd/src/systemd/_sd-common.h diff1 | diff2 | blob | history
src/systemd/src/systemd/sd-dhcp-client.h diff1 | diff2 | blob | history
src/systemd/src/systemd/sd-dhcp-lease.h diff1 | diff2 | blob | history
src/systemd/src/systemd/sd-dhcp6-client.h diff1 | diff2 | blob | history
src/systemd/src/systemd/sd-dhcp6-lease.h diff1 | diff2 | blob | history
src/systemd/src/systemd/sd-event.h diff1 | diff2 | blob | history
src/systemd/src/systemd/sd-id128.h diff1 | diff2 | blob | history
Network connection manager and user applications