platform: merge branch 'th/platform-netns-bgo762408'

System Internals / NetworkManager - Thomas Haller [redhat.com] - 7 March 2016 05:49 UTC

b2b7380 platform: merge branch 'th/platform-netns-bgo762408'

src/Makefile.am | 4 +
src/nm-types.h | 2 +-
src/platform/nm-linux-platform.c | 212 +++++++++------
src/platform/nm-platform.c | 69 ++++-
src/platform/nm-platform.h | 6 +
src/platform/nmp-netns.c | 489 ++++++++++++++++++++++++++++++++++
src/platform/nmp-netns.h | 70 +++++
src/platform/nmp-object.c | 27 +-
src/platform/nmp-object.h | 4 +-
src/platform/tests/test-general.c | 1 +
src/platform/tests/test-link.c | 136 ++++++++++
src/platform/tests/test-nmp-object.c | 4 +-
tools/run-test-valgrind.sh | 8 +
13 files changed, 919 insertions(+), 113 deletions(-)

Upstream: cgit.freedesktop.org

  • Share