Merge lp://staging/~phablet-team/network-manager/lp1435776-wily into lp://staging/~network-manager/network-manager/ubuntu
Proposed by
Tony Espy
| Status: | Merged |
|---|---|
| Approved by: | Mathieu Trudel-Lapierre |
| Approved revision: | 967 |
| Merged at revision: | 967 |
| Proposed branch: | lp://staging/~phablet-team/network-manager/lp1435776-wily |
| Merge into: | lp://staging/~network-manager/network-manager/ubuntu |
| Diff against target: |
82 lines (+12/-24) 2 files modified
debian/changelog (+9/-0) debian/patches/add_ofono_settings_support.patch (+3/-24) |
| To merge this branch: | bzr merge lp://staging/~phablet-team/network-manager/lp1435776-wily |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Mathieu Trudel-Lapierre | Approve | ||
|
Review via email:
|
|||
Description of the change
This change affects the ofono settings plugin and the way that it configures system connections based on ofono gprs_contexts ( aka APNs ).
The change removes the addition of USERNAME and PASSWORD NM_SETTING_GSM settings to the connection, as they're not needed by network-manager, and can cause secret-related activation errors.
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Looks good; let's just merge the patch in to the ofono settings patch, so that things can be more easily upstreamed. Separate patch is fine for SRU purposes, but I don't think this is relevant to SRU.