Merge lp://staging/~azzar1/unity/pam-logging-xenial into lp://staging/unity/7.4
Proposed by
Andrea Azzarone
| Status: | Work in progress |
|---|---|
| Proposed branch: | lp://staging/~azzar1/unity/pam-logging-xenial |
| Merge into: | lp://staging/unity/7.4 |
| Diff against target: |
574 lines (+145/-90) 13 files modified
lockscreen/KylinUserPromptView.cpp (+15/-15) lockscreen/KylinUserPromptView.h (+2/-3) lockscreen/LockScreenAbstractPromptView.h (+5/-3) lockscreen/LockScreenController.cpp (+3/-1) lockscreen/LockScreenController.h (+2/-0) lockscreen/LockScreenPromptFactory.cpp (+4/-3) lockscreen/LockScreenPromptFactory.h (+3/-1) lockscreen/UserAuthenticator.h (+2/-0) lockscreen/UserAuthenticatorPam.cpp (+41/-33) lockscreen/UserAuthenticatorPam.h (+9/-8) lockscreen/UserPromptView.cpp (+51/-15) lockscreen/UserPromptView.h (+7/-4) tests/CMakeLists.txt (+1/-4) |
| To merge this branch: | bzr merge lp://staging/~azzar1/unity/pam-logging-xenial |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Unity Team | Pending | ||
|
Review via email:
|
|||
To post a comment you must log in.
Unmerged revisions
- 4121. By Andrea Azzarone
-
Disable tests. Second try.
- 4120. By Andrea Azzarone
-
Disable tests for the moment.
- 4119. By Andrea Azzarone
-
Revert unwanted changes.
- 4118. By Andrea <andrea@andrea-XPS-15-9550>
-
Add a retry policy if authentication fails to start.
- 4117. By Andrea <andrea@andrea-XPS-15-9550>
-
Add a button to go to the greeter if unity fails to start the authentication procedure.
- 4116. By Andrea <andrea@andrea-XPS-15-9550>
-
Pass around UserAuthenticat
orPam using a shared_ptr. - 4115. By Andrea <andrea@andrea-XPS-15-9550>
-
Merge with trunk
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
