Last commit made on 2016-12-02
Get this branch:
git clone -b resolved
Members of Network-manager can upload to this branch. Log in for directions.

Branch merges

Branch information


Recent commits

47c16e5... by Martin Pitt

Disable resolvconf support

This is broken with DNS plugins other than "dnsmasq" -- it still writes into resolvconf as a nameserver, but this does not exist any more and
will also shadow resolved's stub server on

This ought to be fixed more properly in the future.

98974a8... by Martin Pitt

Re-drop dnsmasq in zesty, in favor of systemd-resolved

But don't Recommend libnss-resolve, because the local resolver +
should suffice for all uses and the resolved nss module is unnecessary added

We need to specify "dns=systemd-resolved" as for the time being our
/etc/resolv.conf points to resolvconf's generated file instead of
systemd-resolved's, so the auto-detection does not work. Do that in a separate
conf.d file in /usr to avoid unnecessary conffile prompts in the future. The
user can still override it in /etc.

LP: #1638836

b1c0547... by Martin Pitt

Add resolved DNS plugin

Backport new systemd-resolved DNS plugin from upstream, so that we can switch
from dnsmasq to that. This will unify DNS lookups between Ubuntu desktop and

f21244e... by Martin Pitt

releasing package network-manager version 1.4.2-2ubuntu3

180d246... by Martin Pitt

debian/tests/nm: Relax asserting the client wifi's MAC address

NM ≥ 1.4 randomizes MAC addresses by default, so we can't test it for equality
any more. Just make sure it's not our test access point.

a3a7aff... by Martin Pitt

releasing package network-manager version 1.4.2-2ubuntu1

ef1279f... by Aron Xu

gbp-pq patch reformatting

4ee9756... by Aron Xu

Update changelog entry since we don't ship ofono anymore

d9e08d8... by Aron Xu

Remove /etc/dbus-1/system.d/nm-ofono.conf in maintainer script

c31b56f... by Aron Xu

Remove patches already dropped from series file