projects / NetworkManager.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 68b3790 8bfe99a)
merge: merge branch 'systemd' into master
authorBeniamino Galvani <bgalvani@redhat.com>
Wed, 7 Oct 2015 08:07:17 +0000 (10:07 +0200)
committerThomas Haller <thaller@redhat.com>
Thu, 8 Oct 2015 12:14:19 +0000 (14:14 +0200)
commit90fb64024c5086601e6a1501a890890bc9b16499
treef76d5c616a94246509de64aad3351a48b3ceb85atree | snapshot
parent68b3790ad36e4a140c43e96335e2be60ac935d76commit | diff
parent8bfe99a1aeaabc552838f6d86770d54f9271ca1bcommit | diff
merge: merge branch 'systemd' into master
52 files changed:
configure.ac diff1 | diff2 | blob | history
src/Makefile.am diff1 | diff2 | blob | history
src/devices/nm-device.c diff1 | diff2 | blob | history
src/dhcp-manager/nm-dhcp-systemd.c diff1 | | blob | history
src/systemd/nm-sd-adapt.h diff1 | | blob | history
src/systemd/src/basic/fileio.c diff1 | diff2 | blob | history
src/systemd/src/basic/fileio.h diff1 | diff2 | blob | history
src/systemd/src/basic/hashmap.c | diff2 | blob | history
src/systemd/src/basic/hashmap.h | diff2 | blob | history
src/systemd/src/basic/log.h diff1 | diff2 | blob | history
src/systemd/src/basic/macro.h diff1 | diff2 | blob | history
src/systemd/src/basic/mempool.c | diff2 | blob | history
src/systemd/src/basic/mempool.h | diff2 | blob | history
src/systemd/src/basic/prioq.c | diff2 | blob | history
src/systemd/src/basic/prioq.h | diff2 | blob | history
src/systemd/src/basic/set.h | diff2 | blob | history
src/systemd/src/basic/siphash24.c diff1 | diff2 | blob | history
src/systemd/src/basic/siphash24.h diff1 | diff2 | blob | history
src/systemd/src/basic/strv.c diff1 | diff2 | blob | history
src/systemd/src/basic/strv.h diff1 | diff2 | blob | history
src/systemd/src/basic/time-util.h diff1 | diff2 | blob | history
src/systemd/src/basic/util.c diff1 | diff2 | blob | history
src/systemd/src/basic/util.h diff1 | diff2 | blob | history
src/systemd/src/libsystemd-network/arp-util.c | diff2 | blob | history
src/systemd/src/libsystemd-network/arp-util.h diff1 | diff2 | blob | history
src/systemd/src/libsystemd-network/lldp-internal.c | diff2 | blob | history
src/systemd/src/libsystemd-network/lldp-internal.h | diff2 | blob | history
src/systemd/src/libsystemd-network/lldp-network.c | diff2 | blob | history
src/systemd/src/libsystemd-network/lldp-network.h | diff2 | blob | history
src/systemd/src/libsystemd-network/lldp-port.c | diff2 | blob | history
src/systemd/src/libsystemd-network/lldp-port.h | diff2 | blob | history
src/systemd/src/libsystemd-network/lldp-tlv.c | diff2 | blob | history
src/systemd/src/libsystemd-network/lldp-tlv.h | diff2 | blob | history
src/systemd/src/libsystemd-network/lldp-util.h | diff2 | blob | history
src/systemd/src/libsystemd-network/lldp.h | diff2 | blob | history
src/systemd/src/libsystemd-network/network-internal.c 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-ipv4acd.c | diff2 | blob | history
src/systemd/src/libsystemd-network/sd-ipv4ll.c diff1 | diff2 | blob | history
src/systemd/src/libsystemd-network/sd-lldp.c | diff2 | blob | history
src/systemd/src/libsystemd/sd-event/event-util.h | diff2 | blob | history
src/systemd/src/libsystemd/sd-id128/sd-id128.c diff1 | diff2 | blob | history
src/systemd/src/shared/dns-domain.c diff1 | diff2 | blob | history
src/systemd/src/shared/dns-domain.h diff1 | diff2 | blob | history
src/systemd/src/systemd/sd-dhcp-client.h diff1 | diff2 | blob | history
src/systemd/src/systemd/sd-dhcp6-client.h diff1 | diff2 | blob | history
src/systemd/src/systemd/sd-icmp6-nd.h diff1 | diff2 | blob | history
src/systemd/src/systemd/sd-ipv4acd.h | diff2 | blob | history
src/systemd/src/systemd/sd-ipv4ll.h diff1 | diff2 | blob | history
src/systemd/src/systemd/sd-lldp.h | diff2 | blob | history
Network connection manager and user applications