Merge lp:~pete-woods/indicator-network/connectivity-api-fixes into lp:indicator-network/15.10
Proposed by
Pete Woods
Status: | Merged |
---|---|
Approved by: | Pete Woods |
Approved revision: | 557 |
Merged at revision: | 557 |
Proposed branch: | lp:~pete-woods/indicator-network/connectivity-api-fixes |
Merge into: | lp:indicator-network/15.10 |
Prerequisite: | lp:~pete-woods/indicator-network/pptp |
Diff against target: |
292 lines (+76/-36) 7 files modified
debian/changelog (+1/-0) doc/qt/cpp/examples/example_networking_status.cpp (+9/-11) doc/qt/qml/examples/example_networking_status.qml (+14/-12) src/connectivity-api/connectivity-qt/connectivityqt/connectivity.h (+6/-11) src/connectivity-api/connectivity-qt/ubuntu/connectivity/networking-status.h (+8/-2) tests/integration/test-connectivity-api-vpn.cpp (+5/-0) tests/integration/test-connectivity-api.cpp (+33/-0) |
To merge this branch: | bzr merge lp:~pete-woods/indicator-network/connectivity-api-fixes |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Charles Kerr (community) | Approve | ||
Review via email:
|
Commit message
Fix Connectivity:
Description of the change
Fix Connectivity:
To post a comment you must log in.
One optional change commented inline, but not a blocker. Otherwise LGTM