Merge lp://staging/~online-accounts/signon/packaging into lp://staging/signon
Proposed by
Alberto Mardegan
| Status: | Merged |
|---|---|
| Approved by: | David Barth |
| Approved revision: | no longer in the source branch. |
| Merged at revision: | 622 |
| Proposed branch: | lp://staging/~online-accounts/signon/packaging |
| Merge into: | lp://staging/signon |
| Diff against target: |
895 lines (+500/-196) 16 files modified
lib/plugins/SignOn/uisessiondata_priv.h (+2/-0) src/signond/accesscontrolmanagerhelper.cpp (+1/-1) src/signond/signondaemonadaptor.cpp (+1/-1) src/signond/signonidentity.cpp (+8/-30) src/signond/signonidentityinfo.cpp (+12/-0) src/signond/signonidentityinfo.h (+2/-0) src/signond/signonsessioncore.cpp (+6/-2) tests/libsignon-qt-tests/ssotestclient.cpp (+127/-161) tests/libsignon-qt-tests/ssotestclient.h (+1/-1) tests/libsignon-qt-tests/testauthsession.cpp (+1/-0) tests/signond-tests/.gitignore (+1/-0) tests/signond-tests/signond-tests.pri (+2/-0) tests/signond-tests/signond-tests.pro (+1/-0) tests/signond-tests/timeouts.cpp (+2/-0) tests/signond-tests/tst_access_control_manager_helper.cpp (+320/-0) tests/signond-tests/tst_access_control_manager_helper.pro (+13/-0) |
| To merge this branch: | bzr merge lp://staging/~online-accounts/signon/packaging |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| PS Jenkins bot (community) | continuous-integration | Approve | |
| Alexandre Abreu (community) | Needs Information | ||
| David Barth (community) | Approve | ||
|
Review via email:
|
|||
Commit message
Merge from upstream
Do not bypass the ACL checks if the Identity has no owner.
Description of the change
Merge from upstream
Do not bypass the ACL checks if the Identity has no owner.
To post a comment you must log in.
Revision history for this message
| David Barth (dbarth) | # |
review:
Approve
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Needs Fixing
(continuous-integration)
Revision history for this message
| Alexandre Abreu (abreu-alexandre) wrote | # |
review:
Needs Information
Revision history for this message
| Alberto Mardegan (mardy) wrote | # |
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Needs Fixing
(continuous-integration)
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Approve
(continuous-integration)
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
FAILED: Continuous integration, rev:622
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild:
http://