lp://qastaging/~stolowski/unity-scopes-api/fix-duplicated-json-line

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp://qastaging/unity-scopes-api/devel at revision 676

PS Jenkins bot (community): Approve (continuous-integration) on 2016-05-30

Marcus Tomlinson (community): Approve on 2016-05-30

unity-api-1-bot: Needs Fixing (continuous-integration) on 2016-05-27

Diff: 103 lines (+25/-8)

5 files modified

src/scopes/internal/JsonCppNode.cpp (+2/-2)
src/scopes/internal/RuntimeImpl.cpp (+1/-1)
src/scopes/internal/smartscopes/SmartScopesClient.cpp (+10/-0)
test/gtest/scopes/internal/JsonNode/JsonNode_test.cpp (+11/-4)
test/gtest/scopes/internal/JsonSettingsSchema/JsonSettingsSchema_test.cpp (+1/-1)

api

Superseded for merging into lp://qastaging/unity-scopes-api

Unity Team: Pending requested 2016-05-27

Diff: 2185 lines (+1146/-437)

26 files modified

CMakeLists.txt (+3/-3)
debian/control.in (+1/-1)
doc/tutorial.dox (+0/-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/internal/JsonCppNode.cpp (+279/-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 (+154/-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)

api

Related source package recipes

1 recipe using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

679. By Paweł Stołowski on 2016-05-27

Remove uneeded line

678. By Paweł Stołowski on 2016-05-27

Ignore empty lines when handling json lines in SmartScopesClient

677. By Paweł Stołowski on 2016-05-27

Empty string is not a valid json

676. By Paweł Stołowski on 2016-05-27

Handle empty string

675. By Marcus Tomlinson on 2016-04-14

Merged trunk

674. By Michi Henning on 2016-04-08

Added more suppressions for copyright check on xenial.

Approved by Marcus Tomlinson, PS Jenkins bot.

673. By Michi Henning on 2016-04-06

Removed libjson-cpp and replaced with json-glib based implementation. Fixes: https://bugs.launchpad.net/bugs/1360247.

Approved by Marcus Tomlinson, PS Jenkins bot.

672. By Michi Henning on 2016-04-06

Re-enabled license/copyright test for xenial.

Approved by PS Jenkins bot, Marcus Tomlinson.

671. By Michi Henning on 2016-04-06

Got rid of category header background, as per design. Fixes: https://bugs.launchpad.net/bugs/1446216.

Approved by PS Jenkins bot, Marcus Tomlinson.

670. By Michi Henning on 2016-04-06

Use a single file for the version number instead of three separate files.

Approved by PS Jenkins bot, Marcus Tomlinson.