Merge branch 'master' into dhcp-merge
authorDan Winship <danw@redhat.com>
Wed, 19 Nov 2014 17:02:00 +0000 (12:02 -0500)
committerDan Winship <danw@redhat.com>
Wed, 19 Nov 2014 17:02:00 +0000 (12:02 -0500)
commit1ea0dd41b057959a9941a9873f7f5c454e81c0ed
treeec7b890dfb00b5d895226777e1b38386a5c33824
parente2e4637cf4832a82bff56442440baf57874d0f53
parentaf525e8a18b3bd822751c339916cc3c7396d9832
Merge branch 'master' into dhcp-merge

Conflicts:
src/dhcp-manager/systemd-dhcp/src/libsystemd-network/sd-dhcp-client.c
src/dhcp-manager/systemd-dhcp/src/libsystemd-network/sd-dhcp-lease.c
src/dhcp-manager/systemd-dhcp/src/shared/fileio.c
src/dhcp-manager/systemd-dhcp/src/shared/util.c
src/dhcp-manager/systemd-dhcp/src/systemd/sd-dhcp-client.h
src/dhcp-manager/systemd-dhcp/src/systemd/sd-dhcp-lease.h
12 files changed:
src/dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp6-option.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-client.c
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/fileio.c
src/dhcp-manager/systemd-dhcp/src/shared/in-addr-util.c
src/dhcp-manager/systemd-dhcp/src/shared/strv.c
src/dhcp-manager/systemd-dhcp/src/shared/utf8.c
src/dhcp-manager/systemd-dhcp/src/shared/util.c
src/dhcp-manager/systemd-dhcp/src/shared/util.h