Merge lp://qastaging/~mardy/signon/lp1415492-rtm into lp://qastaging/~online-accounts/signon/rtm-14.09
Proposed by
Alberto Mardegan
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Approved by: | Alberto Mardegan | ||||
| Approved revision: | 624 | ||||
| Merged at revision: | 622 | ||||
| Proposed branch: | lp://qastaging/~mardy/signon/lp1415492-rtm | ||||
| Merge into: | lp://qastaging/~online-accounts/signon/rtm-14.09 | ||||
| Diff against target: |
1057 lines (+539/-202) 24 files modified
debian/changelog (+17/-0) debian/control (+1/-0) debian/rules (+1/-0) lib/plugins/SignOn/uisessiondata_priv.h (+2/-0) src/signond/accesscontrolmanagerhelper.cpp (+1/-1) src/signond/default-secrets-storage.cpp (+7/-4) src/signond/default-secrets-storage.h (+1/-0) src/signond/pluginproxy.cpp (+4/-0) src/signond/signondaemon.cpp (+2/-0) 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/run-with-signond.sh (+5/-2) tests/signond-tests/.gitignore (+1/-0) tests/signond-tests/signond-tests.pri (+2/-0) tests/signond-tests/signond-tests.pro (+2/-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://qastaging/~mardy/signon/lp1415492-rtm | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Alberto Mardegan (community) | Approve | ||
|
Review via email:
|
|||
Commit message
Merge from upstream
* Enable P2P D-Bus connections (LP: #1415492)
* Add missing build dependency on libdbus-1-dev
Description of the change
Merge from upstream
* Enable P2P D-Bus connections (LP: #1415492)
* Add missing build dependency on libdbus-1-dev
To post a comment you must log in.
Revision history for this message
| Alberto Mardegan (mardy) | # |
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
