Last commit made on 2016-06-16
Get this branch:
git clone -b cyphermox/merge
Members of Network-manager can upload to this branch. Log in for directions.

Branch merges

Branch information


Recent commits

cef1571... by Mathieu Trudel-Lapierre

Fix typo in changelog entry

10-managed... exists directly in debian/, not in debian/patches/.

Signed-off-by: Mathieu Trudel-Lapierre <email address hidden>

fca1b2e... by Mathieu Trudel-Lapierre

debian/patches/dns-manager-don-t-merge-split-DNS-search-domains.patch: do not add split DNS search domains to resolv.conf; doing so would risk leaking names to non-VPN DNS nameservers when attempting to resolve non- FQDN names. (LP: #1592721)

063e28e... by Mathieu Trudel-Lapierre

Fixup: debian/patches/Read-config-from-run.patch should skip files that exist in /etc.

db8a840... by Mathieu Trudel-Lapierre

Nullify 10-globally-managed-devices.conf rather than replacing it with a different content.

6126f6e... by Mathieu Trudel-Lapierre

debian/network-manager.postinst: on upgrade from previous versions of NM, make sure we migrate from no global "unmanaged" policy to something equivalent where we may have a global policy, but explicitly override it to be disabled; so that on upgrade users do not suddenly see some of their network devices no longer being handled by NM.

9beb021... by Mathieu Trudel-Lapierre

debian/patches/10-globally-managed-devices.conf: ship a default config to explicitly unmanage anything that is not wifi or wwan: we definitely want NM to manage wifi and mobile data; and probably don't want it to touch wired in many cases.

d552837... by Mathieu Trudel-Lapierre

debian/patches/Read-config-from-run.patch: also read configuration from /run, which is to override whatever might be shipped in /usr/lib; and be overriden by /etc or command-line arguments. (LP: #1591898)

4a813ea... by Aron Xu

Cherry pick patch for WPA* Enterprise private key file (LP: #1575614)

9f40397... by Mathieu Trudel-Lapierre

Merge branch 'powersave'

86247f2... by Aron Xu

Use VCS-Git to make git the authoritative repo