lp:~marcustomlinson/unity-scopes-api/merge-trunk

Branch merges

Propose for merging

No branches dependent on this one.

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

PS Jenkins bot (community): Approve (continuous-integration) on 2014-07-24

Michal Hruby (community): Approve on 2014-07-24

Diff: 856 lines (+257/-86)

25 files modified

CONFIGFILES (+4/-4)
debian/changelog (+24/-0)
include/unity/scopes/internal/DfltConfig.h.in (+3/-3)
scoperegistry/scoperegistry.cpp (+69/-2)
src/scopes/internal/JsonSettingsSchema.cpp (+1/-1)
src/scopes/internal/smartscopes/SSRegistryObject.cpp (+3/-2)
src/scopes/internal/zmq_middleware/ZmqConfig.cpp (+2/-2)
src/scopes/internal/zmq_middleware/ZmqMiddleware.cpp (+1/-1)
src/scopes/internal/zmq_middleware/ZmqObject.cpp (+32/-35)
test/gtest/scopes/Activation/Activation_test.cpp (+18/-1)
test/gtest/scopes/Activation/Runtime.ini.in (+1/-1)
test/gtest/scopes/Filters/Filters_test.cpp (+18/-1)
test/gtest/scopes/Filters/Runtime.ini.in (+1/-1)
test/gtest/scopes/IdleShutdown/IdleShutdown_test.cpp (+14/-0)
test/gtest/scopes/IdleShutdown/Runtime.ini.in (+1/-1)
test/gtest/scopes/Invocation/Invocation_test.cpp (+17/-2)
test/gtest/scopes/Invocation/Runtime.ini.in (+1/-1)
test/gtest/scopes/Invocation/TestScope.cpp (+1/-1)
test/gtest/scopes/Registry/CMakeLists.txt (+1/-0)
test/gtest/scopes/Registry/Registry_test.cpp (+4/-4)
test/gtest/scopes/Registry/scopes/testscopeA/testscopeA.ini.in (+2/-2)
test/gtest/scopes/Runtime/Runtime.ini.in (+1/-1)
test/gtest/scopes/Runtime/Runtime_test.cpp (+22/-0)
test/gtest/scopes/internal/smartscopes/smartscopesproxy/smartscopesproxy_test.cpp (+6/-10)
test/gtest/scopes/internal/zmq_middleware/RegistryI/RegistryI_test.cpp (+10/-10)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

422. By Marcus Tomlinson on 2014-07-24

Whoops, one change that shouldn't have been reverted

421. By Marcus Tomlinson on 2014-07-24

Merged trunk and fixed issues

420. By Marcus Tomlinson on 2014-07-23

Introduced QueryMetadata base for shared functionality of *Metadata classes, and added set_internet_connectivity() and internet_connectivity() to QueryMetadata.

Approved by Michal Hruby, PS Jenkins bot.

419. By Michal Hruby on 2014-07-22

Added one more appearance attribute.

Approved by PS Jenkins bot, Pete Woods.

418. By Michi Henning on 2014-07-22

Require g++-4.9.

Approved by PS Jenkins bot, Michi Henning.

417. By Michi Henning on 2014-07-21

Added appearance attributes to check for unknown attributes in config parser.
Added tests.

Approved by PS Jenkins bot.

416. By Marcus Tomlinson on 2014-07-21

Replaced EXPECT_EQ(true with EXPECT_TRUE.

Approved by Michi Henning, PS Jenkins bot.

415. By Michi Henning on 2014-07-17

 Changed wait time in Invocation test for second
 attempt to 2 seconds, to avoid spurious failures in CI.
 Improved diagnostics in RegistryObject for exec/kill
 failures. Fixed RegistryI test to use correct exec
 timeout. Re-enabled the disabled Invocation and Runtime tests.
 Fixed these tests to use the latest API.

Approved by PS Jenkins bot, Michi Henning, Marcus Tomlinson.

414. By Jussi Pakkanen on 2014-07-16

Fix issues found by flint++.

Approved by PS Jenkins bot.

413. By Michi Henning on 2014-07-16

Merge trunk.

Approved by PS Jenkins bot.