Merge lp:~robertcarr/unity-mir/usleep-include into lp:unity-mir

Proposed by Robert Carr
Status: Rejected
Rejected by: Robert Carr
Proposed branch: lp:~robertcarr/unity-mir/usleep-include
Merge into: lp:unity-mir
Diff against target: 11 lines (+1/-0)
1 file modified
src/unity-mir/qmirserver.cpp (+1/-0)
To merge this branch: bzr merge lp:~robertcarr/unity-mir/usleep-include
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Needs Fixing
Mir development team Pending
Review via email: mp+209564@code.launchpad.net

Description of the change

Required to build on my system.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:185
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/~robertcarr/unity-mir/usleep-include/+merge/209564/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/unity-mir-ci/277/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-amd64-ci/140
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-armhf-ci/141
        deb: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-armhf-ci/141/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-i386-ci/140

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-mir-ci/277/rebuild

review: Needs Fixing (continuous-integration)

Unmerged revisions

185. By Robert Carr

qmirserver.cpp: include unistd.h for usleep

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/unity-mir/qmirserver.cpp'
2--- src/unity-mir/qmirserver.cpp 2014-01-08 12:48:40 +0000
3+++ src/unity-mir/qmirserver.cpp 2014-03-06 00:11:19 +0000
4@@ -29,6 +29,7 @@
5
6 // Std
7 #include <thread>
8+#include <unistd.h> // for usleep
9
10 // local
11 #include "qmirserver.h"

Subscribers

People subscribed via source and target branches