Merge lp://qastaging/~pete-woods/indicator-network/improve-logging into lp://qastaging/indicator-network
Proposed by
Pete Woods
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Approved by: | Pete Woods | ||||
| Approved revision: | 598 | ||||
| Merged at revision: | 600 | ||||
| Proposed branch: | lp://qastaging/~pete-woods/indicator-network/improve-logging | ||||
| Merge into: | lp://qastaging/indicator-network | ||||
| Prerequisite: | lp://qastaging/~unity-api-team/indicator-network/connectivity-api-mobile-data-management | ||||
| Diff against target: |
935 lines (+213/-70) 25 files modified
src/agent/KeyringCredentialStore.cpp (+2/-2) src/agent/SecretAgent.cpp (+8/-8) src/agent/agent-main.cpp (+3/-0) src/indicator/main.cpp (+4/-0) src/indicator/nmofono/connection/active-connection-manager.cpp (+1/-1) src/indicator/nmofono/hotspot-manager.cpp (+12/-12) src/indicator/nmofono/kill-switch.cpp (+3/-3) src/indicator/nmofono/manager-impl.cpp (+22/-17) src/indicator/nmofono/vpn/vpn-connection.cpp (+3/-3) src/indicator/nmofono/vpn/vpn-manager.cpp (+1/-1) src/indicator/nmofono/wifi/wifi-link-impl.cpp (+9/-4) src/indicator/nmofono/wwan/modem.cpp (+6/-2) src/indicator/root-state.cpp (+1/-1) src/indicator/vpn-status-notifier.cpp (+1/-1) src/menumodel-cpp/action-group-merger.cpp (+3/-3) src/menumodel-cpp/menu-item.cpp (+1/-1) src/notify-cpp/notification.cpp (+4/-4) src/qpowerd/qpowerd.cpp (+1/-1) src/util/CMakeLists.txt (+1/-0) src/util/logging.cpp (+59/-0) src/util/logging.h (+29/-0) tests/unit/secret-agent/secret-agent-main.cpp (+29/-1) tests/unit/secret-agent/test-secret-agent.cpp (+3/-3) tests/utils/CMakeLists.txt (+3/-2) tests/utils/main.cpp (+4/-0) |
||||
| To merge this branch: | bzr merge lp://qastaging/~pete-woods/indicator-network/improve-logging | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Charles Kerr (community) | Approve | ||
| Antti Kaijanmäki | Pending | ||
| PS Jenkins bot | continuous-integration | Pending | |
|
Review via email:
|
|||
This proposal supersedes a proposal from 2016-05-25.
Commit message
Improve logging
Description of the change
Improve logging
To post a comment you must log in.
Revision history for this message
| Charles Kerr (charlesk) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
LGTM.