dhcp: merge branch 'systemd-dhcp' into master
authorThomas Haller <thaller@redhat.com>
Mon, 23 Mar 2015 20:00:10 +0000 (21:00 +0100)
committerThomas Haller <thaller@redhat.com>
Mon, 23 Mar 2015 20:12:31 +0000 (21:12 +0100)
commit99df201a0cca6a9bddfbcf7434597a2f0123b196
treeb124281609c5762236aa94479c1ca487ca57fa21
parentca9679334cb7abf66a9e80050d229d82e1823625
parentddb5112180f68480157f67addcbf36e9c5154d85
dhcp: merge branch 'systemd-dhcp' into master

Conflicts:
src/dhcp-manager/systemd-dhcp/src/shared/util.c
src/dhcp-manager/systemd-dhcp/src/libsystemd-network/sd-dhcp-client.c
src/dhcp-manager/systemd-dhcp/src/libsystemd/sd-id128/sd-id128.c
src/dhcp-manager/systemd-dhcp/src/shared/log.h
src/dhcp-manager/systemd-dhcp/src/shared/path-util.c
src/dhcp-manager/systemd-dhcp/src/shared/path-util.h
src/dhcp-manager/systemd-dhcp/src/shared/socket-util.h
src/dhcp-manager/systemd-dhcp/src/shared/strv.c
src/dhcp-manager/systemd-dhcp/src/shared/strv.h
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-event.h