NetworkManager

network-manager:xenial-1647283

  1. Git
  2. lp:network-manager
  3. xenial-1647283
Last commit made on 2017-01-18
Get this branch:
git clone -b xenial-1647283 https://git.launchpad.net/network-manager
Members of Network-manager can upload to this branch. Log in for directions.

Branch merges

Branch information

Name:
xenial-1647283
Repository:
lp:network-manager

Recent commits

3727a84... by Aron Xu

Backport patches from master branch for LP: #1647283

b744b33... by Jeremy Bícha

releasing package network-manager version 1.2.6-0ubuntu0.16.04.1

8334b33... by Aron Xu

Update changelog

e9ad18f... by Aron Xu

Add changelog entry for SRU

7174731... by Aron Xu

Update patches for 1.2.6

1c841cf... by Aron Xu

debian/rules: allow parallel building

7c50189... by Aron Xu

Merge tag 'upstream/1.2.6' into xenial

Upstream version 1.2.6

Conflicts:
 NEWS
 aclocal.m4
 clients/cli/common.c
 clients/cli/nmcli-completion
 config.h.in
 configure
 configure.ac
 docs/api/Makefile.in
 docs/api/html/NetworkManager.conf.html
 docs/api/html/NetworkManager.html
 docs/api/html/dbus-types.html
 docs/api/html/gdbus-org.freedesktop.NetworkManager.AccessPoint.html
 docs/api/html/gdbus-org.freedesktop.NetworkManager.AgentManager.html
 docs/api/html/gdbus-org.freedesktop.NetworkManager.Connection.Active.html
 docs/api/html/gdbus-org.freedesktop.NetworkManager.DHCP4Config.html
 docs/api/html/gdbus-org.freedesktop.NetworkManager.DHCP6Config.html
 docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Adsl.html
 docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Bluetooth.html
 docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Bond.html
 docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Bridge.html
 docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Generic.html
 docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.IPTunnel.html
 docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Infiniband.html
 docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Macvlan.html
 docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Modem.html
 docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.OlpcMesh.html
 docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Team.html
 docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Tun.html
 docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Veth.html
 docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Vlan.html
 docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Vxlan.html
 docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.WiMax.html
 docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Wired.html
 docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Wireless.html
 docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.html
 docs/api/html/gdbus-org.freedesktop.NetworkManager.IP4Config.html
 docs/api/html/gdbus-org.freedesktop.NetworkManager.IP6Config.html
 docs/api/html/gdbus-org.freedesktop.NetworkManager.PPP.html
 docs/api/html/gdbus-org.freedesktop.NetworkManager.SecretAgent.html
 docs/api/html/gdbus-org.freedesktop.NetworkManager.Settings.Connection.html
 docs/api/html/gdbus-org.freedesktop.NetworkManager.Settings.html
 docs/api/html/gdbus-org.freedesktop.NetworkManager.VPN.Connection.html
 docs/api/html/gdbus-org.freedesktop.NetworkManager.VPN.Plugin.html
 docs/api/html/gdbus-org.freedesktop.NetworkManager.html
 docs/api/html/index.html
 docs/api/html/ix01.html
 docs/api/html/license.html
 docs/api/html/manpages.html
 docs/api/html/nm-dbus-types.html
 docs/api/html/nm-online.html
 docs/api/html/nm-settings-ifcfg-rh.html
 docs/api/html/nm-settings-keyfile.html
 docs/api/html/nm-settings.html
 docs/api/html/nm-vpn-dbus-types.html
 docs/api/html/nmcli-examples.html
 docs/api/html/nmcli.html
 docs/api/html/nmtui.html
 docs/api/html/ref-settings.html
 docs/api/html/secrets-flags.html
 docs/api/html/spec.html
 docs/api/version.xml
 docs/libnm-glib/Makefile.in
 docs/libnm-glib/html/NMAccessPoint.html
 docs/libnm-glib/html/NMActiveConnection.html
 docs/libnm-glib/html/NMClient.html
 docs/libnm-glib/html/NMDHCP4Config.html
 docs/libnm-glib/html/NMDHCP6Config.html
 docs/libnm-glib/html/NMDevice.html
 docs/libnm-glib/html/NMDeviceAdsl.html
 docs/libnm-glib/html/NMDeviceBond.html
 docs/libnm-glib/html/NMDeviceBridge.html
 docs/libnm-glib/html/NMDeviceBt.html
 docs/libnm-glib/html/NMDeviceEthernet.html
 docs/libnm-glib/html/NMDeviceGeneric.html
 docs/libnm-glib/html/NMDeviceInfiniband.html
 docs/libnm-glib/html/NMDeviceModem.html
 docs/libnm-glib/html/NMDeviceOlpcMesh.html
 docs/libnm-glib/html/NMDeviceTeam.html
 docs/libnm-glib/html/NMDeviceVlan.html
 docs/libnm-glib/html/NMDeviceWifi.html
 docs/libnm-glib/html/NMDeviceWimax.html
 docs/libnm-glib/html/NMIP4Config.html
 docs/libnm-glib/html/NMIP6Config.html
 docs/libnm-glib/html/NMObject.html
 docs/libnm-glib/html/NMRemoteConnection.html
 docs/libnm-glib/html/NMRemoteSettings.html
 docs/libnm-glib/html/NMSecretAgent.html
 docs/libnm-glib/html/NMVPNConnection.html
 docs/libnm-glib/html/NMWimaxNsp.html
 docs/libnm-glib/html/annotation-glossary.html
 docs/libnm-glib/html/api-index-full.html
 docs/libnm-glib/html/ch02.html
 docs/libnm-glib/html/index.html
 docs/libnm-glib/html/libnm-glib-NMVPNPlugin.html
 docs/libnm-glib/html/libnm-glib-NMVpnPluginUiWidget.html
 docs/libnm-glib/html/libnm-glib-nm-types.html
 docs/libnm-glib/html/libnm-glib-nm-vpn-plugin-utils.html
 docs/libnm-glib/html/libnm-glib.devhelp2
 docs/libnm-glib/html/object-tree.html
 docs/libnm-glib/html/ref-overview.html
 docs/libnm-glib/version.xml
 docs/libnm-util/Makefile.in
 docs/libnm-util/html/NMConnection.html
 docs/libnm-util/html/NMSetting.html
 docs/libnm-util/html/NMSetting8021x.html
 docs/libnm-util/html/NMSettingAdsl.html
 docs/libnm-util/html/NMSettingBluetooth.html
 docs/libnm-util/html/NMSettingBond.html
 docs/libnm-util/html/NMSettingBridge.html
 docs/libnm-util/html/NMSettingBridgePort.html
 docs/libnm-util/html/NMSettingCdma.html
 docs/libnm-util/html/NMSettingConnection.html
 docs/libnm-util/html/NMSettingDcb.html
 docs/libnm-util/html/NMSettingGeneric.html
 docs/libnm-util/html/NMSettingGsm.html
 docs/libnm-util/html/NMSettingIP4Config.html
 docs/libnm-util/html/NMSettingIP6Config.html
 docs/libnm-util/html/NMSettingInfiniband.html
 docs/libnm-util/html/NMSettingOlpcMesh.html
 docs/libnm-util/html/NMSettingPPP.html
 docs/libnm-util/html/NMSettingPPPOE.html
 docs/libnm-util/html/NMSettingSerial.html
 docs/libnm-util/html/NMSettingTeam.html
 docs/libnm-util/html/NMSettingTeamPort.html
 docs/libnm-util/html/NMSettingVPN.html
 docs/libnm-util/html/NMSettingVlan.html
 docs/libnm-util/html/NMSettingWimax.html
 docs/libnm-util/html/NMSettingWired.html
 docs/libnm-util/html/NMSettingWireless.html
 docs/libnm-util/html/NMSettingWirelessSecurity.html
 docs/libnm-util/html/annotation-glossary.html
 docs/libnm-util/html/api-index-full.html
 docs/libnm-util/html/ch01.html
 docs/libnm-util/html/index.html
 docs/libnm-util/html/libnm-util-NetworkManager.html
 docs/libnm-util/html/libnm-util-NetworkManagerVPN.html
 docs/libnm-util/html/libnm-util-nm-utils.html
 docs/libnm-util/html/libnm-util.devhelp2
 docs/libnm-util/html/object-tree.html
 docs/libnm-util/version.xml
 docs/libnm/Makefile.in
 docs/libnm/html/NMAccessPoint.html
 docs/libnm/html/NMActiveConnection.html
 docs/libnm/html/NMClient.html
 docs/libnm/html/NMConnection.html
 docs/libnm/html/NMDevice.html
 docs/libnm/html/NMDeviceAdsl.html
 docs/libnm/html/NMDeviceBond.html
 docs/libnm/html/NMDeviceBridge.html
 docs/libnm/html/NMDeviceBt.html
 docs/libnm/html/NMDeviceEthernet.html
 docs/libnm/html/NMDeviceGeneric.html
 docs/libnm/html/NMDeviceIPTunnel.html
 docs/libnm/html/NMDeviceInfiniband.html
 docs/libnm/html/NMDeviceMacvlan.html
 docs/libnm/html/NMDeviceModem.html
 docs/libnm/html/NMDeviceOlpcMesh.html
 docs/libnm/html/NMDeviceTeam.html
 docs/libnm/html/NMDeviceTun.html
 docs/libnm/html/NMDeviceVlan.html
 docs/libnm/html/NMDeviceVxlan.html
 docs/libnm/html/NMDeviceWifi.html
 docs/libnm/html/NMDeviceWimax.html
 docs/libnm/html/NMDhcpConfig.html
 docs/libnm/html/NMIPConfig.html
 docs/libnm/html/NMObject.html
 docs/libnm/html/NMRemoteConnection.html
 docs/libnm/html/NMSecretAgentOld.html
 docs/libnm/html/NMSetting.html
 docs/libnm/html/NMSetting8021x.html
 docs/libnm/html/NMSettingAdsl.html
 docs/libnm/html/NMSettingBluetooth.html
 docs/libnm/html/NMSettingBond.html
 docs/libnm/html/NMSettingBridge.html
 docs/libnm/html/NMSettingBridgePort.html
 docs/libnm/html/NMSettingCdma.html
 docs/libnm/html/NMSettingConnection.html
 docs/libnm/html/NMSettingDcb.html
 docs/libnm/html/NMSettingGeneric.html
 docs/libnm/html/NMSettingGsm.html
 docs/libnm/html/NMSettingIP4Config.html
 docs/libnm/html/NMSettingIP6Config.html
 docs/libnm/html/NMSettingIPConfig.html
 docs/libnm/html/NMSettingIPTunnel.html
 docs/libnm/html/NMSettingInfiniband.html
 docs/libnm/html/NMSettingMacvlan.html
 docs/libnm/html/NMSettingOlpcMesh.html
 docs/libnm/html/NMSettingPpp.html
 docs/libnm/html/NMSettingPppoe.html
 docs/libnm/html/NMSettingSerial.html
 docs/libnm/html/NMSettingTeam.html
 docs/libnm/html/NMSettingTeamPort.html
 docs/libnm/html/NMSettingTun.html
 docs/libnm/html/NMSettingVlan.html
 docs/libnm/html/NMSettingVpn.html
 docs/libnm/html/NMSettingVxlan.html
 docs/libnm/html/NMSettingWimax.html
 docs/libnm/html/NMSettingWired.html
 docs/libnm/html/NMSettingWireless.html
 docs/libnm/html/NMSettingWirelessSecurity.html
 docs/libnm/html/NMSimpleConnection.html
 docs/libnm/html/NMVpnConnection.html
 docs/libnm/html/NMVpnEditorPlugin.html
 docs/libnm/html/NMWimaxNsp.html
 docs/libnm/html/annotation-glossary.html
 docs/libnm/html/api-index-full.html
 docs/libnm/html/ch02.html
 docs/libnm/html/ch03.html
 docs/libnm/html/ch04.html
 docs/libnm/html/ch05.html
 docs/libnm/html/ch06.html
 docs/libnm/html/index.html
 docs/libnm/html/libnm-nm-dbus-interface.html
 docs/libnm/html/libnm-nm-errors.html
 docs/libnm/html/libnm-nm-utils.html
 docs/libnm/html/libnm-nm-version.html
 docs/libnm/html/libnm-nm-vpn-dbus-interface.html
 docs/libnm/html/libnm.devhelp2
 docs/libnm/html/object-tree.html
 docs/libnm/html/ref-overview.html
 docs/libnm/version.xml
 gtk-doc.make
 introspection/nm-access-point.xml
 introspection/nm-active-connection.xml
 introspection/nm-device-adsl.xml
 introspection/nm-device-bond.xml
 introspection/nm-device-bridge.xml
 introspection/nm-device-bt.xml
 introspection/nm-device-ethernet.xml
 introspection/nm-device-generic.xml
 introspection/nm-device-infiniband.xml
 introspection/nm-device-ip-tunnel.xml
 introspection/nm-device-macvlan.xml
 introspection/nm-device-modem.xml
 introspection/nm-device-olpc-mesh.xml
 introspection/nm-device-team.xml
 introspection/nm-device-tun.xml
 introspection/nm-device-veth.xml
 introspection/nm-device-vlan.xml
 introspection/nm-device-vxlan.xml
 introspection/nm-device-wifi.xml
 introspection/nm-device-wimax.xml
 introspection/nm-dhcp4-config.xml
 introspection/nm-dhcp6-config.xml
 introspection/nm-ip4-config.xml
 introspection/nm-ip6-config.xml
 introspection/nm-manager.xml
 introspection/nm-settings-connection.xml
 introspection/nm-settings.xml
 introspection/nm-vpn-connection.xml
 introspection/nm-wimax-nsp.xml
 introspection/nmdbus-access-point-org.freedesktop.NetworkManager.AccessPoint.xml
 introspection/nmdbus-active-connection-org.freedesktop.NetworkManager.Connection.Active.xml
 introspection/nmdbus-device-adsl-org.freedesktop.NetworkManager.Device.Adsl.xml
 introspection/nmdbus-device-bond-org.freedesktop.NetworkManager.Device.Bond.xml
 introspection/nmdbus-device-bridge-org.freedesktop.NetworkManager.Device.Bridge.xml
 introspection/nmdbus-device-bt-org.freedesktop.NetworkManager.Device.Bluetooth.xml
 introspection/nmdbus-device-ethernet-org.freedesktop.NetworkManager.Device.Wired.xml
 introspection/nmdbus-device-generic-org.freedesktop.NetworkManager.Device.Generic.xml
 introspection/nmdbus-device-infiniband-org.freedesktop.NetworkManager.Device.Infiniband.xml
 introspection/nmdbus-device-ip-tunnel-org.freedesktop.NetworkManager.Device.IPTunnel.xml
 introspection/nmdbus-device-macvlan-org.freedesktop.NetworkManager.Device.Macvlan.xml
 introspection/nmdbus-device-modem-org.freedesktop.NetworkManager.Device.Modem.xml
 introspection/nmdbus-device-olpc-mesh-org.freedesktop.NetworkManager.Device.OlpcMesh.xml
 introspection/nmdbus-device-team-org.freedesktop.NetworkManager.Device.Team.xml
 introspection/nmdbus-device-tun-org.freedesktop.NetworkManager.Device.Tun.xml
 introspection/nmdbus-device-veth-org.freedesktop.NetworkManager.Device.Veth.xml
 introspection/nmdbus-device-vlan-org.freedesktop.NetworkManager.Device.Vlan.xml
 introspection/nmdbus-device-vxlan-org.freedesktop.NetworkManager.Device.Vxlan.xml
 introspection/nmdbus-device-wifi-org.freedesktop.NetworkManager.Device.Wireless.xml
 introspection/nmdbus-device-wimax-org.freedesktop.NetworkManager.Device.WiMax.xml
 introspection/nmdbus-dhcp4-config-org.freedesktop.NetworkManager.DHCP4Config.xml
 introspection/nmdbus-dhcp6-config-org.freedesktop.NetworkManager.DHCP6Config.xml
 introspection/nmdbus-ip4-config-org.freedesktop.NetworkManager.IP4Config.xml
 introspection/nmdbus-ip6-config-org.freedesktop.NetworkManager.IP6Config.xml
 introspection/nmdbus-manager-org.freedesktop.NetworkManager.xml
 introspection/nmdbus-settings-connection-org.freedesktop.NetworkManager.Settings.Connection.xml
 introspection/nmdbus-settings-org.freedesktop.NetworkManager.Settings.xml
 introspection/nmdbus-vpn-connection-org.freedesktop.NetworkManager.VPN.Connection.xml
 libnm-core/nm-setting-vlan.c
 libnm-core/nm-setting-vpn.c
 libnm-core/tests/test-general.c
 libnm/nm-client.c
 libnm/nm-device-vlan.c
 libnm/nm-device-vxlan.c
 libnm/nm-manager.c
 libnm/nm-secret-agent-old.c
 man/NetworkManager.8
 man/NetworkManager.conf.5
 man/nm-online.1
 man/nm-settings-ifcfg-rh.5
 man/nm-settings-ifcfg-rh.xml
 man/nm-settings-keyfile.5
 man/nm-settings-keyfile.xml
 man/nm-settings.5
 man/nm-settings.xml
 man/nmcli-examples.7
 man/nmcli.1
 man/nmtui.1
 po/pl.po
 shared/nm-version-macros.h
 shared/nm-version-macros.h.in
 src/devices/adsl/nm-device-adsl.c
 src/devices/nm-device-ethernet.c
 src/devices/nm-device.c
 src/devices/wifi/nm-device-wifi.c
 src/devices/wwan/nm-modem.c
 src/nm-activation-request.c
 src/nm-auth-utils.c
 src/nm-exported-object.c
 src/nm-iface-helper.c
 src/nm-manager.c
 src/nm-session-monitor.c
 src/ppp-manager/nm-ppp-manager.c
 src/ppp-manager/nm-ppp-manager.h
 src/settings/plugins/ifcfg-rh/nm-ifcfg-connection.c
 src/supplicant-manager/nm-supplicant-interface.c

3176edc... by Jeremy Bícha

releasing package network-manager version 1.2.4-0ubuntu0.16.04.1

2ac2709... by Aron Xu

Imported Upstream version 1.2.6

8b8117d... by Aron Xu

Add manager-fix-state-transition-on-resuming-from-sleep.patch