Merge lp://staging/unity-scopes-api/staging into lp://staging/unity-scopes-api
Proposed by
Paweł Stołowski
| Status: | Merged |
|---|---|
| Approved by: | Marcus Tomlinson |
| Approved revision: | 305 |
| Merged at revision: | 351 |
| Proposed branch: | lp://staging/unity-scopes-api/staging |
| Merge into: | lp://staging/unity-scopes-api |
| Diff against target: |
492 lines (+202/-97) 11 files modified
include/unity/scopes/internal/Utils.h (+5/-0) scoperegistry/scoperegistry.cpp (+1/-51) src/scopes/internal/JsonCppNode.cpp (+10/-0) src/scopes/internal/Utils.cpp (+83/-0) src/scopes/internal/zmq_middleware/ZmqObject.cpp (+1/-4) test/gtest/scopes/Registry/scopes/testscopeB/testscopeB.cpp (+5/-1) test/gtest/scopes/Registry/scopes/testscopeB/testscopeB.ini.in (+1/-1) test/gtest/scopes/internal/SettingsDB/SettingsDB_test.cpp (+7/-3) test/gtest/scopes/internal/Utils/Utils_test.cpp (+86/-0) test/gtest/scopes/internal/zmq_middleware/RegistryI/RegistryI_test.cpp (+2/-37) unity-scopes.map (+1/-0) |
| To merge this branch: | bzr merge lp://staging/unity-scopes-api/staging |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Marcus Tomlinson (community) | Approve | ||
|
Review via email:
|
|||
Commit message
Merged devel.
Description of the change
Merged devel.
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
ACK