Merge lp://staging/~unity-api-team/unity-scopes-api/gcc-5-fixes into lp://staging/unity-scopes-api
Proposed by
Marcus Tomlinson
| Status: | Merged |
|---|---|
| Approved by: | Marcus Tomlinson |
| Approved revision: | 620 |
| Merged at revision: | 341 |
| Proposed branch: | lp://staging/~unity-api-team/unity-scopes-api/gcc-5-fixes |
| Merge into: | lp://staging/unity-scopes-api |
| Diff against target: |
96 lines (+21/-22) 4 files modified
debian/control (+1/-2) src/scopes/internal/SearchReplyImpl.cpp (+2/-2) test/gtest/scopes/internal/ScopeConfig/CMakeLists.txt (+16/-16) test/gtest/scopes/internal/zmq_middleware/RegistryI/RegistryI_test.cpp (+2/-2) |
| To merge this branch: | bzr merge lp://staging/~unity-api-team/unity-scopes-api/gcc-5-fixes |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| PS Jenkins bot (community) | continuous-integration | Approve | |
| Marcus Tomlinson (community) | Approve | ||
|
Review via email:
|
|||
This proposal supersedes a proposal from 2015-07-24.
Commit message
Updated standards version to 3.9.6 in debian/control.
Removed copyonly from configure() calls because cmake 3.2.2 doesn't like it.
Removed g++ dependency from debian/control because bzr bd emitted a warning.
Description of the change
Updated standards version to 3.9.6 in debian/control.
Removed copyonly from configure() calls because cmake 3.2.2 doesn't like it.
Removed g++ dependency from debian/control because bzr bd emitted a warning.
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
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Approve
(continuous-integration)
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Approve
(continuous-integration)
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
FAILED: Continuous integration, rev:619
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://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://