merge: branch 'bg/hostname-bgo740409'

System Internals / NetworkManager - Beniamino Galvani [redhat.com] - 12 June 2015 09:06 UTC

135999c merge: branch 'bg/hostname-bgo740409'

Makefile.am | 1 -
configure.ac | 33 +-
man/NetworkManager.conf.xml.in | 14 +-
src/Makefile.am | 5 +
src/settings/nm-settings.c | 381 +++++++--
src/settings/nm-system-config-interface.c | 10 +-
src/settings/nm-system-config-interface.h | 3 -
src/settings/plugins/Makefile.am | 6 +-
src/settings/plugins/README | 33 +
src/settings/plugins/example/Makefile.am | 32 -
src/settings/plugins/example/README | 35 -
src/settings/plugins/example/common.h | 45 -
.../plugins/example/nm-example-connection.c | 189 -----
.../plugins/example/nm-example-connection.h | 55 --
src/settings/plugins/example/plugin.c | 858 --------------------
src/settings/plugins/example/plugin.h | 55 --
src/settings/plugins/example/reader.c | 47 --
src/settings/plugins/example/writer.c | 56 --
src/settings/plugins/ibft/plugin.c | 4 -
src/settings/plugins/ifcfg-rh/plugin.c | 205 +----
src/settings/plugins/ifcfg-suse/Makefile.am | 19 -
src/settings/plugins/ifcfg-suse/plugin.c | 312 -------
src/settings/plugins/ifcfg-suse/plugin.h | 50 --
src/settings/plugins/ifnet/net_utils.c | 41 -
src/settings/plugins/ifnet/net_utils.h | 2 -
src/settings/plugins/ifnet/plugin.c | 72 +-
src/settings/plugins/ifnet/tests/Makefile.am | 1 -
src/settings/plugins/ifnet/tests/hostname | 2 -
src/settings/plugins/ifnet/tests/test-ifnet.c | 28 -
src/settings/plugins/ifupdown/plugin.c | 130 +--
src/settings/plugins/keyfile/plugin.c | 241 +-----
31 files changed, 448 insertions(+), 2517 deletions(-)

Upstream: cgit.freedesktop.org

  • Share