Merge lp://qastaging/~mardy/online-accounts-api/apparmor-1489489 into lp://qastaging/online-accounts-api

Proposed by Alberto Mardegan
Status: Merged
Approved by: Alberto Mardegan
Approved revision: 27
Merged at revision: 34
Proposed branch: lp://qastaging/~mardy/online-accounts-api/apparmor-1489489
Merge into: lp://qastaging/online-accounts-api
Diff against target: 157 lines (+51/-24)
4 files modified
src/lib/OnlineAccountsDaemon/client_registry.cpp (+16/-6)
tests/daemon/functional_tests/dbus_apparmor.py (+28/-14)
tests/daemon/functional_tests/fake_dbus_apparmor.h (+3/-3)
tests/daemon/functional_tests/functional_tests.cpp (+4/-1)
To merge this branch: bzr merge lp://qastaging/~mardy/online-accounts-api/apparmor-1489489
Reviewer Review Type Date Requested Status
Alexandre Abreu (community) Approve
Review via email: mp+307560@code.qastaging.launchpad.net

Commit message

Use GetConnectionCredentials() method instead of the deprecated apparmor-specific method.

Description of the change

Use GetConnectionCredentials() method instead of the deprecated apparmor-specific method.

To post a comment you must log in.
Revision history for this message
Alexandre Abreu (abreu-alexandre) wrote :

LGTM

review: Approve
28. By Alberto Mardegan

Merge from trunk
* Fix reply of password-based authentication (LP: #1628473)
* debian/control:
  - Depend on qttools5-dev-tools for qdoc (LP: #1608814)
* debian/rules:
  - No need to invoke dh_python

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches