projects / NetworkManager.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 39f8b7b 5599a82)
dhcp: merge branch 'master' into th/systemd-dhcp-integration
authorThomas Haller <thaller@redhat.com>
Sun, 1 Feb 2015 14:25:19 +0000 (15:25 +0100)
committerThomas Haller <thaller@redhat.com>
Tue, 3 Mar 2015 10:13:41 +0000 (11:13 +0100)
commit7afb63ca34e0f88ab9a19d4c1d77265a7949e0e7
tree7696ef4ece4e7a0f9f18b22550d12cd90a87668ftree | snapshot
parent39f8b7b5427ced828455b9cc13b6b352f88ce35acommit | diff
parent5599a82d0dc7b69497cb29f67bb0fb8cd618d32ccommit | diff
dhcp: merge branch 'master' into th/systemd-dhcp-integration

Only basic merging. The result does not yet compile.

https://bugzilla.gnome.org/show_bug.cgi?id=742719

Conflicts:
src/dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp-packet.c
src/dhcp-manager/systemd-dhcp/src/libsystemd-network/network-internal.c
src/dhcp-manager/systemd-dhcp/src/libsystemd-network/network-internal.h
src/dhcp-manager/systemd-dhcp/src/libsystemd-network/sd-dhcp-lease.c
src/dhcp-manager/systemd-dhcp/src/libsystemd-network/sd-dhcp6-client.c
src/dhcp-manager/systemd-dhcp/src/shared/macro.h
src/dhcp-manager/systemd-dhcp/src/shared/strv.c
src/dhcp-manager/systemd-dhcp/src/shared/util.c
src/dhcp-manager/systemd-dhcp/src/shared/util.h
src/dhcp-manager/systemd-dhcp/src/systemd/sd-dhcp6-client.h
27 files changed:
src/dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp-internal.h diff1 | diff2 | blob | history
src/dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp-network.c diff1 | diff2 | blob | history
src/dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp-packet.c diff1 | diff2 | blob | history
src/dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp6-internal.h diff1 | diff2 | blob | history
src/dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp6-protocol.h diff1 | diff2 | blob | history
src/dhcp-manager/systemd-dhcp/src/libsystemd-network/network-internal.c diff1 | diff2 | blob | history
src/dhcp-manager/systemd-dhcp/src/libsystemd-network/network-internal.h diff1 | diff2 | blob | history
src/dhcp-manager/systemd-dhcp/src/libsystemd-network/sd-dhcp-client.c diff1 | diff2 | blob | history
src/dhcp-manager/systemd-dhcp/src/libsystemd-network/sd-dhcp-lease.c diff1 | diff2 | blob | history
src/dhcp-manager/systemd-dhcp/src/libsystemd-network/sd-dhcp6-client.c diff1 | diff2 | blob | history
src/dhcp-manager/systemd-dhcp/src/libsystemd-network/sd-dhcp6-lease.c diff1 | diff2 | blob | history
src/dhcp-manager/systemd-dhcp/src/shared/in-addr-util.c diff1 | diff2 | blob | history
src/dhcp-manager/systemd-dhcp/src/shared/in-addr-util.h diff1 | diff2 | blob | history
src/dhcp-manager/systemd-dhcp/src/shared/list.h diff1 | diff2 | blob | history
src/dhcp-manager/systemd-dhcp/src/shared/macro.h diff1 | diff2 | blob | history
src/dhcp-manager/systemd-dhcp/src/shared/socket-util.h diff1 | diff2 | blob | history
src/dhcp-manager/systemd-dhcp/src/shared/strv.c diff1 | diff2 | blob | history
src/dhcp-manager/systemd-dhcp/src/shared/strv.h diff1 | diff2 | blob | history
src/dhcp-manager/systemd-dhcp/src/shared/time-util.c diff1 | diff2 | blob | history
src/dhcp-manager/systemd-dhcp/src/shared/time-util.h diff1 | diff2 | blob | history
src/dhcp-manager/systemd-dhcp/src/shared/utf8.c diff1 | diff2 | blob | history
src/dhcp-manager/systemd-dhcp/src/shared/utf8.h diff1 | diff2 | blob | history
src/dhcp-manager/systemd-dhcp/src/shared/util.c diff1 | diff2 | blob | history
src/dhcp-manager/systemd-dhcp/src/shared/util.h diff1 | diff2 | blob | history
src/dhcp-manager/systemd-dhcp/src/systemd/sd-dhcp6-client.h diff1 | diff2 | blob | history
src/dhcp-manager/systemd-dhcp/src/systemd/sd-dhcp6-lease.h diff1 | diff2 | blob | history
src/dhcp-manager/systemd-dhcp/src/systemd/sd-id128.h diff1 | diff2 | blob | history
Network connection manager and user applications