~alfonsosanchezbeato/network-manager/+git/ubuntu:touch-vivid-add-statitics

Branch merges

Propose for merging

Merged into network-manager:touch-xenial at revision 60fc5de6336a484a4c37286fcca53d32b8f013e8

Network-manager: Pending requested 2016-06-03

Diff: 856 lines (+842/-0)

2 files modified

debian/patches/Add-statistics-interface.patch (+841/-0)
debian/patches/series (+1/-0)

api

Merged into network-manager:touch-vivid at revision 92ac043cd375662fa7546ccdd0cc7aecbc275929

Tony Espy: Approve on 2016-06-03

Diff: 856 lines (+842/-0)

2 files modified

debian/patches/Add-statistics-interface.patch (+841/-0)
debian/patches/series (+1/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related charm recipes

ae28015... by Alfonso Sanchez-Beato on 2016-06-03

ubuntu: Add statistics interface

c89d7b3... by Aron Xu on 2016-05-13

Update changelog

d5a0bcf... by Aron Xu on 2016-05-12

Use gbp-pq to manage patches

4187d4f... by Aron Xu on 2016-05-13

Allow parallel building

bf07f5f... by Aron Xu on 2016-05-12

Merge tag 'upstream/1.2.2'

Upstream version 1.2.2

Conflicts:
 AUTHORS
 Makefile.in
 NEWS
 clients/cli/agent.c
 clients/cli/common.c
 clients/cli/connections.c
 clients/cli/devices.c
 clients/cli/general.c
 clients/cli/nmcli-completion
 clients/cli/nmcli.c
 clients/cli/nmcli.h
 clients/cli/settings-docs.c
 clients/cli/settings.c
 clients/cli/utils.c
 clients/cli/utils.h
 clients/common/nm-vpn-helpers.c
 configure
 configure.ac
 docs/api/Makefile.am
 docs/api/Makefile.in
 docs/api/html/NetworkManager.conf.html
 docs/api/html/NetworkManager.devhelp2
 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.Device.Bluetooth.html
 docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Modem.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.SecretAgent.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/index.sgml
 docs/api/html/ix01.html
 docs/api/html/nm-settings.html
 docs/api/html/nmcli.html
 docs/api/html/ref-settings.html
 docs/api/html/spec.html
 docs/api/network-manager-docs.xml
 docs/api/settings-spec.xml
 docs/api/version.xml
 docs/libnm-glib/html/index.html
 docs/libnm-glib/version.xml
 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/index.html
 docs/libnm-util/html/libnm-util-nm-utils.html
 docs/libnm-util/html/object-tree.html
 docs/libnm-util/version.xml
 docs/libnm/Makefile.am
 docs/libnm/Makefile.in
 docs/libnm/html/NMAccessPoint.html
 docs/libnm/html/NMActiveConnection.html
 docs/libnm/html/NMClient.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/api-index-full.html
 docs/libnm/html/ch03.html
 docs/libnm/html/index.html
 docs/libnm/html/index.sgml
 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-vpn-dbus-interface.html
 docs/libnm/html/libnm.devhelp2
 docs/libnm/html/object-tree.html
 docs/libnm/libnm-sections.txt
 docs/libnm/version.xml
 libnm-core/Makefile.am
 libnm-core/Makefile.in
 libnm-core/nm-connection.c
 libnm-core/nm-dbus-interface.h
 libnm-core/nm-setting-8021x.h
 libnm-core/nm-setting-adsl.h
 libnm-core/nm-setting-bluetooth.h
 libnm-core/nm-setting-bond.h
 libnm-core/nm-setting-bridge-port.h
 libnm-core/nm-setting-bridge.h
 libnm-core/nm-setting-cdma.h
 libnm-core/nm-setting-dcb.h
 libnm-core/nm-setting-generic.h
 libnm-core/nm-setting-gsm.h
 libnm-core/nm-setting-infiniband.h
 libnm-core/nm-setting-ip-config.h
 libnm-core/nm-setting-ip-tunnel.h
 libnm-core/nm-setting-ip4-config.h
 libnm-core/nm-setting-ip6-config.c
 libnm-core/nm-setting-ip6-config.h
 libnm-core/nm-setting-macvlan.h
 libnm-core/nm-setting-olpc-mesh.h
 libnm-core/nm-setting-ppp.h
 libnm-core/nm-setting-pppoe.h
 libnm-core/nm-setting-serial.h
 libnm-core/nm-setting-team-port.h
 libnm-core/nm-setting-team.h
 libnm-core/nm-setting-tun.h
 libnm-core/nm-setting-vlan.h
 libnm-core/nm-setting-vpn.h
 libnm-core/nm-setting-vxlan.h
 libnm-core/nm-setting-wimax.h
 libnm-core/nm-setting-wired.h
 libnm-core/nm-setting-wireless-security.h
 libnm-core/nm-setting-wireless.h
 libnm-core/nm-simple-connection.h
 libnm-core/nm-vpn-editor-plugin.c
 libnm-core/nm-vpn-plugin-info.h
 libnm/nm-access-point.h
 libnm/nm-active-connection.h
 libnm/nm-client.h
 libnm/nm-device-adsl.h
 libnm/nm-device-bond.h
 libnm/nm-device-bridge.h
 libnm/nm-device-bt.h
 libnm/nm-device-ethernet.h
 libnm/nm-device-generic.h
 libnm/nm-device-infiniband.h
 libnm/nm-device-ip-tunnel.h
 libnm/nm-device-macvlan.h
 libnm/nm-device-modem.h
 libnm/nm-device-olpc-mesh.h
 libnm/nm-device-team.h
 libnm/nm-device-tun.h
 libnm/nm-device-vlan.h
 libnm/nm-device-vxlan.h
 libnm/nm-device-wifi.h
 libnm/nm-device-wimax.h
 libnm/nm-device.h
 libnm/nm-dhcp-config.h
 libnm/nm-dhcp4-config.h
 libnm/nm-dhcp6-config.h
 libnm/nm-ip-config.h
 libnm/nm-ip4-config.h
 libnm/nm-ip6-config.h
 libnm/nm-manager.h
 libnm/nm-object.h
 libnm/nm-property-docs.xml
 libnm/nm-remote-connection.h
 libnm/nm-remote-settings.h
 libnm/nm-secret-agent-old.h
 libnm/nm-setting-docs.xml
 libnm/nm-vpn-connection.h
 libnm/nm-vpn-plugin-old.h
 libnm/nm-vpn-service-plugin.h
 libnm/nm-wimax-nsp.h
 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/nmcli.xml
 man/nmtui.1
 po/ar.po
 po/as.po
 <email address hidden>
 po/bg.po
 po/bn_IN.po
 po/bs.po
 po/ca.po
 po/cs.po
 po/da.po
 po/de.po
 po/dz.po
 po/el.po
 po/en_CA.po
 po/en_GB.po
 po/eo.po
 po/es.po
 po/et.po
 po/eu.po
 po/fi.po
 po/fr.po
 po/gd.po
 po/gl.po
 po/gu.po
 po/he.po
 po/hi.po
 po/hr.po
 po/hu.po
 po/id.po
 po/it.po
 po/ja.po
 po/ka.po
 po/kn.po
 po/ko.po
 po/ku.po
 po/lt.po
 po/lv.po
 po/mk.po
 po/ml.po
 po/mr.po
 po/nb.po
 po/ne.po
 po/nl.po
 po/oc.po
 po/or.po
 po/pa.po
 po/pl.po
 po/pt.po
 po/pt_BR.po
 po/ru.po
 po/rw.po
 po/sk.po
 po/sl.po
 po/sq.po
 po/sr.po
 <email address hidden>
 po/sv.po
 po/ta.po
 po/te.po
 po/th.po
 po/tr.po
 po/uk.po
 po/vi.po
 po/wa.po
 po/zh_CN.po
 po/zh_HK.po
 po/zh_TW.po
 shared/nm-shared-utils.c
 shared/nm-version-macros.h
 shared/nm-version-macros.h.in
 src/Makefile.am
 src/Makefile.in
 src/devices/bluetooth/nm-bluez-device.c
 src/devices/nm-device-ethernet.c
 src/devices/nm-device-factory.c
 src/devices/nm-device.c
 src/devices/wwan/nm-modem-broadband.c
 src/devices/wwan/nm-modem.c
 src/dhcp-manager/nm-dhcp-client.c
 src/dhcp-manager/nm-dhcp-systemd.c
 src/dns-manager/nm-dns-dnsmasq.c
 src/dns-manager/nm-dns-plugin.c
 src/dnsmasq-manager/nm-dnsmasq-manager.c
 src/nm-auth-subject.c
 src/nm-core-utils.c
 src/nm-core-utils.h
 src/org.freedesktop.NetworkManager.conf
 src/platform/nm-linux-platform.c
 src/settings/nm-settings.c
 src/settings/plugins/ifnet/connection_parser.c
 src/settings/plugins/ifupdown/interface_parser.c
 src/tests/Makefile.am
 src/tests/Makefile.in
 src/tests/test-utils.c
 tools/Makefile.am
 tools/Makefile.in

6eede7b... by Aron Xu on 2016-05-12

Imported Upstream version 1.2.2

91bbae7... by Aron Xu on 2016-04-29

Imported Debian patch 1.2.0-0ubuntu1

b9d7d7f... by Aron Xu on 2016-05-12

Imported Upstream version 1.2.0

2be223e... by Aron Xu on 2016-05-12

Imported Upstream version 1.1.93