Merge lp:~mandel/unity/plan-b into lp:unity
Proposed by
Manuel de la Peña
Status: | Merged |
---|---|
Approved by: | Marco Trevisan (Treviño) |
Approved revision: | no longer in the source branch. |
Merged at revision: | 3308 |
Proposed branch: | lp:~mandel/unity/plan-b |
Merge into: | lp:unity |
Diff against target: |
234 lines (+103/-27) 4 files modified
dash/previews/MusicPreview.cpp (+79/-23) dash/previews/MusicPreview.h (+6/-0) unity-shared/PreviewStyle.cpp (+12/-0) unity-shared/PreviewStyle.h (+6/-4) |
To merge this branch: | bzr merge lp:~mandel/unity/plan-b |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
PS Jenkins bot (community) | continuous-integration | Approve | |
Marco Trevisan (Treviño) | Approve | ||
Nick Dedekind (community) | Approve | ||
Review via email: mp+158383@code.launchpad.net |
Commit message
Add code to ensure that a label is shown when u1 creds are not present.
Description of the change
Add code to ensure that a label is shown when u1 creds are not present.
To post a comment you must log in.
FAILED: Continuous integration, rev:3275 /code.launchpad .net/~mandel/ unity/plan- b/+merge/ 158383/ +edit-commit- message
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https:/
http:// jenkins. qa.ubuntu. com/job/ unity-ci/ 4/ jenkins. qa.ubuntu. com/job/ unity-raring- amd64-ci/ 4 jenkins. qa.ubuntu. com/job/ unity-raring- armhf-ci/ 4 jenkins. qa.ubuntu. com/job/ unity-raring- i386-ci/ 4
Executed test runs:
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild: s-jenkins: 8080/job/ unity-ci/ 4/rebuild
http://