Merge lp://qastaging/~mardy/signon-apparmor-extension/apparmor-1489489 into lp://qastaging/signon-apparmor-extension

Proposed by Alberto Mardegan
Status: Merged
Approved by: Alberto Mardegan
Approved revision: 31
Merged at revision: 25
Proposed branch: lp://qastaging/~mardy/signon-apparmor-extension/apparmor-1489489
Merge into: lp://qastaging/signon-apparmor-extension
Diff against target: 446 lines (+183/-41)
11 files modified
.qmake.conf (+2/-0)
common-project-config.pri (+6/-2)
debian/control (+4/-3)
src/access-control-manager.cpp (+18/-9)
src/access-control-manager.h (+3/-0)
tests/dbus_apparmor.py (+50/-0)
tests/fake_dbus.h (+52/-0)
tests/mock/apparmor.cpp (+0/-11)
tests/mock/mock.pro (+2/-3)
tests/tst_extension.cpp (+38/-11)
tests/tst_extension.pro (+8/-2)
To merge this branch: bzr merge lp://qastaging/~mardy/signon-apparmor-extension/apparmor-1489489
Reviewer Review Type Date Requested Status
Alexandre Abreu (community) Approve
Review via email: mp+306316@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.
28. By Alberto Mardegan

Rename mock file

29. By Alberto Mardegan

Update apparmor dep version

30. By Alberto Mardegan

Enable C++11

Revision history for this message
Alexandre Abreu (abreu-alexandre) wrote :

a few comments and questions

review: Needs Information
Revision history for this message
Alberto Mardegan (mardy) :
31. By Alberto Mardegan

Address review comments

Revision history for this message
Alexandre Abreu (abreu-alexandre) wrote :

LGTM

review: Approve

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