Merge lp://staging/unity-scopes-api/staging into lp://staging/unity-scopes-api

Proposed by Marcus Tomlinson
Status: Merged
Approved by: Paweł Stołowski
Approved revision: 324
Merged at revision: 367
Proposed branch: lp://staging/unity-scopes-api/staging
Merge into: lp://staging/unity-scopes-api
Diff against target: 2397 lines (+1285/-441)
31 files modified
CMakeLists.txt (+3/-3)
RELEASE_NOTES.md (+7/-0)
debian/VERSION (+1/-1)
debian/changelog (+22/-0)
debian/control.in (+1/-1)
doc/tutorial.dox (+96/-1)
include/unity/scopes/internal/JsonCppNode.h (+17/-10)
include/unity/scopes/internal/JsonNodeInterface.h (+2/-3)
include/unity/scopes/internal/JsonSettingsSchema.h (+1/-1)
include/unity/scopes/internal/gobj_memory.h (+212/-0)
scoperegistry/scoperegistry.cpp (+0/-1)
src/scopes/CategoryRenderer.cpp (+1/-1)
src/scopes/PreviewWidget.cpp (+9/-2)
src/scopes/internal/JsonCppNode.cpp (+283/-200)
src/scopes/internal/JsonSettingsSchema.cpp (+149/-162)
src/scopes/internal/Logger.cpp (+2/-2)
src/scopes/internal/RuntimeImpl.cpp (+1/-1)
src/scopes/internal/ScopeConfig.cpp (+0/-2)
src/scopes/internal/smartscopes/SmartScopesClient.cpp (+10/-0)
src/scopes/internal/zmq_middleware/StopPublisher.cpp (+1/-1)
src/scopes/testing/ScopeMetadataBuilder.cpp (+1/-3)
test/copyright/check_copyright.sh (+1/-7)
test/gtest/scopes/Registry/Registry_test.cpp (+0/-1)
test/gtest/scopes/Registry/scopes/testscopeA/testscopeA.ini.in (+0/-1)
test/gtest/scopes/internal/CMakeLists.txt (+1/-0)
test/gtest/scopes/internal/JsonNode/JsonNode_test.cpp (+153/-17)
test/gtest/scopes/internal/JsonSettingsSchema/JsonSettingsSchema_test.cpp (+37/-5)
test/gtest/scopes/internal/SettingsDB/SettingsDB_test.cpp (+4/-4)
test/gtest/scopes/internal/gobj_ptr/CMakeLists.txt (+3/-0)
test/gtest/scopes/internal/gobj_ptr/gobj_ptr_test.cpp (+208/-0)
test/gtest/scopes/internal/smartscopes/SmartScopesClient/SmartScopesClient_test.cpp (+59/-11)
To merge this branch: bzr merge lp://staging/unity-scopes-api/staging
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Pending
Unity Team Pending
Review via email: mp+295415@code.staging.launchpad.net

Commit message

* Got rid of category header background, as per design (Bug #1446216).
* Re-enabled license/copyright test for xenial+.
* Removed libjson-cpp and replaced with json-glib based implementation (Bug #1360247).
* Fixed Yakkety build.

To post a comment you must log in.
319. By Marcus Tomlinson

Sync changelog

320. By Marcus Tomlinson

Update changelog and RELEASE_NOTES.md

321. By Marcus Tomlinson

Bump version

322. By Marcus Tomlinson

Merge devel

323. By Marcus Tomlinson

Merged devel

324. By Paweł Stołowski

Merged devel changes

Revision history for this message
Robert Bruce Park (robru) wrote :

Changelog nitpick inline.

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: