Merge lp://staging/~ken-vandine/share-app/mainview into lp://staging/share-app

Proposed by Ken VanDine
Status: Merged
Approved by: Bill Filler
Approved revision: 49
Merged at revision: 48
Proposed branch: lp://staging/~ken-vandine/share-app/mainview
Merge into: lp://staging/share-app
Prerequisite: lp://staging/~sil2100/share-app/rename_libhud-qt_and_hud1
Diff against target: 68 lines (+14/-5)
4 files modified
debian/changelog (+7/-1)
debian/rules (+3/-0)
main.qml (+2/-2)
tests/autopilot/share_app/emulators/main_window.py (+2/-2)
To merge this branch: bzr merge lp://staging/~ken-vandine/share-app/mainview
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Bill Filler (community) Approve
Review via email: mp+160720@code.staging.launchpad.net

This proposal supersedes a proposal from 2013-04-20.

Commit message

* Ported to use MainView
 * run unit tests during build

Description of the change

 * Ported to use MainView
 * run unit tests during build

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:49
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://code.launchpad.net/~ken-vandine/share-app/mainview/+merge/160720/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/share-app-ci/23/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/share-app-raring-amd64-ci/4
    SUCCESS: http://jenkins.qa.ubuntu.com/job/share-app-raring-armhf-ci/23
        deb: http://jenkins.qa.ubuntu.com/job/share-app-raring-armhf-ci/23/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/share-app-raring-i386-ci/23

Click here to trigger a rebuild:
http://s-jenkins:8080/job/share-app-ci/23/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Bill Filler (bfiller) wrote :

approved

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) :
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