team: merge branch 'th/bgo731905_team_plugin'

System Internals / NetworkManager - Thomas Haller [redhat.com] - 27 June 2014 06:27 UTC

918ff2b team: merge branch 'th/bgo731905_team_plugin'

configure.ac | 1 +
contrib/fedora/rpm/NetworkManager.spec | 29 +-
po/POTFILES.in | 2 +-
src/Makefile.am | 17 +-
src/devices/nm-device-bond.c | 14 +
src/devices/nm-device-bridge.c | 33 +-
src/devices/nm-device-bridge.h | 2 -
src/devices/nm-device-factory.c | 17 +
src/devices/nm-device-factory.h | 22 +
src/devices/nm-device-team.c | 893 --------------------------------
src/devices/nm-device-team.h | 64 ---
src/devices/nm-device.c | 110 ++--
src/devices/nm-device.h | 13 +-
src/devices/team/Makefile.am | 74 +++
src/devices/team/exports.ver | 7 +
src/devices/team/nm-device-team.c | 880 +++++++++++++++++++++++++++++++
src/devices/team/nm-device-team.h | 65 +++
src/devices/team/nm-team-factory.c | 109 ++++
src/devices/team/nm-team-factory.h | 37 ++
src/nm-manager.c | 152 +++++-
20 files changed, 1472 insertions(+), 1069 deletions(-)

Upstream: cgit.freedesktop.org

  • Share