merge branch 'th/kill_child'

System Internals / NetworkManager - Thomas Haller [redhat.com] - 10 July 2014 09:33 UTC

397762c merge branch 'th/kill_child'

.gitignore | 1 +
include/nm-test-utils.h | 5 +
src/NetworkManagerUtils.c | 422 ++++++++++++++++++++++++++++++
src/NetworkManagerUtils.h | 8 +
src/devices/nm-device.c | 19 +-
src/devices/team/nm-device-team.c | 33 +--
src/dhcp-manager/nm-dhcp-client.c | 44 +---
src/dns-manager/nm-dns-plugin.c | 40 +--
src/dnsmasq-manager/nm-dnsmasq-manager.c | 29 +-
src/ppp-manager/nm-ppp-manager.c | 29 +-
src/tests/Makefile.am | 12 +-
src/tests/test-general-with-expect.c | 342 ++++++++++++++++++++++++
src/tests/test-general.c | 11 +-
13 files changed, 807 insertions(+), 188 deletions(-)

Upstream: cgit.freedesktop.org

  • Share