merge: branch 'fg/802-3-prop_rh1353612_II'

System Internals / NetworkManager - Francesco Giudici [redhat.com] - 22 November 2016 08:28 UTC

e0c50a9 merge: branch 'fg/802-3-prop_rh1353612_II'

Makefile.am | 2 +
clients/cli/settings.c | 51 +++--
libnm-core/nm-connection.c | 25 +++
libnm-core/nm-setting-wired.c | 60 ++++--
src/NetworkManager.ver-orig | 3 +
src/devices/nm-device-ethernet.c | 133 +++++++++---
src/platform/nm-platform-utils.c | 85 +++++++-
src/platform/nm-platform-utils.h | 3 +-
src/platform/nm-platform.c | 33 ++-
src/platform/nm-platform.h | 9 +-
.../plugins/ifcfg-rh/nms-ifcfg-rh-reader.c | 223 ++++++++++++++------
.../plugins/ifcfg-rh/nms-ifcfg-rh-writer.c | 51 ++++-
.../ifcfg-test-wired-auto-negotiate-on | 22 ++
.../ifcfg-test-wired-unknown-ethtool-opt | 22 ++
.../plugins/ifcfg-rh/tests/test-ifcfg-rh.c | 150 +++++++++++++
15 files changed, 718 insertions(+), 154 deletions(-)

Upstream: cgit.freedesktop.org

  • Share