Ubuntu Music App

Merge lp://qastaging/~popey/music-app/fix-1288885 into lp://qastaging/music-app/trusty

  1. fix-1288885
  2. Merge into trusty
Proposed by Alan Pope 🍺🐧🐱 🦄
Status: Merged
Approved by: Andrew Hayzen
Approved revision: 376
Merged at revision: 374
Proposed branch: lp://qastaging/~popey/music-app/fix-1288885
Merge into: lp://qastaging/music-app/trusty
Diff against target: 26 lines (+4/-1)
2 files modified
CMakeLists.txt (+1/-1)
debian/changelog (+3/-0)
To merge this branch: bzr merge lp://qastaging/~popey/music-app/fix-1288885
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Andrew Hayzen Approve
Review via email: mp+210175@code.qastaging.launchpad.net

Commit message

fix lp:1288885

To post a comment you must log in.
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:373
http://91.189.93.70:8080/job/music-app-ci/637/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1656
    SUCCESS: http://91.189.93.70:8080/job/music-app-raring-amd64-ci/637
    SUCCESS: http://91.189.93.70:8080/job/music-app-saucy-amd64-ci/639
    SUCCESS: http://91.189.93.70:8080/job/music-app-trusty-amd64-ci/358

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/music-app-ci/637/rebuild

review: Approve (continuous-integration)
Revision history for this message
Andrew Hayzen (ahayzen) wrote :

Looks good, but you'll need to resolve the merge conflict :(

review: Approve
lp://qastaging/~popey/music-app/fix-1288885 updated
374. By Alan Pope 🍺🐧🐱 🦄

resolve conflict

375. By Alan Pope 🍺🐧🐱 🦄

Put right what once went wrong

376. By Alan Pope 🍺🐧🐱 🦄

Once more unto the breach

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:374
http://91.189.93.70:8080/job/music-app-ci/638/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1676
    SUCCESS: http://91.189.93.70:8080/job/music-app-raring-amd64-ci/638
    SUCCESS: http://91.189.93.70:8080/job/music-app-saucy-amd64-ci/640
    SUCCESS: http://91.189.93.70:8080/job/music-app-trusty-amd64-ci/359

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/music-app-ci/638/rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to status/vote changes: