Merge lp://qastaging/~jonas-drange/ubuntu-system-settings/dim-timeout-1437510-vivid into lp://qastaging/ubuntu-system-settings/15.04
Proposed by
Jonas G. Drange
| Status: | Merged |
|---|---|
| Approved by: | Ken VanDine |
| Approved revision: | 1418 |
| Merged at revision: | 1427 |
| Proposed branch: | lp://qastaging/~jonas-drange/ubuntu-system-settings/dim-timeout-1437510-vivid |
| Merge into: | lp://qastaging/ubuntu-system-settings/15.04 |
| Diff against target: |
63 lines (+18/-1) 2 files modified
plugins/battery/SleepValues.qml (+5/-1) tests/autopilot/ubuntu_system_settings/tests/test_security.py (+13/-0) |
| To merge this branch: | bzr merge lp://qastaging/~jonas-drange/ubuntu-system-settings/dim-timeout-1437510-vivid |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Ken VanDine | Approve | ||
| PS Jenkins bot | continuous-integration | Approve | |
|
Review via email:
|
|||
Commit message
Ensure dim-timeout is 10 seconds less than activity-timeout
Description of the change
Ensure dim-timeout is 10 seconds less than activity-timeout
To post a comment you must log in.
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
PASSED: Continuous integration, rev:1418
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://