Merge lp://staging/~michihenning/unity-scopes-api/moldy-oldies into lp://staging/unity-scopes-api

Proposed by Michi Henning
Status: Merged
Approved by: Marcus Tomlinson
Approved revision: 559
Merged at revision: 271
Proposed branch: lp://staging/~michihenning/unity-scopes-api/moldy-oldies
Merge into: lp://staging/unity-scopes-api
Diff against target: 25 lines (+1/-6)
2 files modified
test/headers/includechecker.py (+1/-1)
valgrind-suppress (+0/-5)
To merge this branch: bzr merge lp://staging/~michihenning/unity-scopes-api/moldy-oldies
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Needs Fixing
Marcus Tomlinson (community) Approve
Review via email: mp+244254@code.staging.launchpad.net

Commit message

Replace old references to Ice with zmq.

Description of the change

Replace old references to Ice with zmq.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Marcus Tomlinson (marcustomlinson) wrote :

I'm happy to approve this. Could you just merge trunk again, the diff is rather large :P (trunk should have all the devel stuff in it now)

559. By Michi Henning

Merged trunk.

Revision history for this message
Marcus Tomlinson (marcustomlinson) wrote :

+1

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Michi Henning (michihenning) wrote :

Yeah, well, Jenkins is broken yet again. The web interface to CI is broken too, so I can't look there either. What fun.

Revision history for this message
Paweł Stołowski (stolowski) wrote :

The problem with jenkins is a (temporary?) networking issue:

E: Failed to fetch http://archive.ubuntu.com/ubuntu/pool/main/d/dbus-test-runner/libdbustest1_15.04.0+15.04.20141209-0ubuntu1_amd64.deb: Connection failed [IP: 91.189.91.14 80]

The tests pass, so nothing to be worried about. I've just got everything built for landing in a silo.

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 all changes: