lp:~marcustomlinson/unity-scopes-api/revert_debug_timeout_config_params

Branch merges

Propose for merging

No branches dependent on this one.

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

Paweł Stołowski (community): Approve on 2015-07-01

PS Jenkins bot (community): Approve (continuous-integration) on 2015-07-01

Diff: 422 lines (+23/-99)

14 files modified

CMakeLists.txt (+1/-1)
CONFIGFILES (+0/-18)
RELEASE_NOTES.md (+0/-5)
debian/changelog (+0/-7)
debian/libunity-scopes3.symbols (+0/-1)
include/unity/scopes/internal/DfltConfig.h.in (+7/-9)
include/unity/scopes/internal/RegistryConfig.h (+0/-2)
include/unity/scopes/internal/zmq_middleware/ZmqConfig.h (+0/-2)
include/unity/scopes/internal/zmq_middleware/ZmqMiddleware.h (+0/-2)
scoperegistry/scoperegistry.cpp (+11/-15)
src/scopes/internal/RegistryConfig.cpp (+1/-13)
src/scopes/internal/zmq_middleware/ZmqConfig.cpp (+0/-13)
src/scopes/internal/zmq_middleware/ZmqMiddleware.cpp (+0/-6)
src/scopes/internal/zmq_middleware/ZmqScope.cpp (+3/-5)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

607. By Marcus Tomlinson on 2015-07-01

Reverted Debug.Process.Timeout and Debug.Locate.Timeout configuration parameters

606. By Paweł Stołowski on 2015-06-30

Reverted r604 (restored TRY_EXPECT macro).

Approved by Marcus Tomlinson, PS Jenkins bot.

605. By Marcus Tomlinson on 2015-06-30

Hardcoded debug process and locate timeouts replaced with config parameters. Fixes: https://bugs.launchpad.net/bugs/1469105.

Approved by PS Jenkins bot, Pawel Stolowski.

604. By Paweł Stołowski on 2015-06-29

No need for TRY_EXPECT* macros in settings db test.

Approved by PS Jenkins bot, Marcus Tomlinson.

603. By Marcus Tomlinson on 2015-06-29

Allow 30s for locate() to complete when requesting a scope's debug_mode() status. Fixes: https://bugs.launchpad.net/bugs/1469069.

Approved by PS Jenkins bot, Michi Henning, Pawel Stolowski.

602. By Paweł Stołowski on 2015-06-29

Merged trunk

601. By Paweł Stołowski on 2015-06-22

Use mtime instead of inotify to detect settings file changes. . Fixes: https://bugs.launchpad.net/bugs/1453041.

Approved by Michi Henning, PS Jenkins bot.

600. By Paweł Stołowski on 2015-06-17

Workaround test failure with Variant serialization to json string when float is used.

Approved by Xavi Garcia, PS Jenkins bot.

599. By Paweł Stołowski on 2015-06-12

Merged trunk

598. By Paweł Stołowski on 2015-06-11

Print a warning if using deprecated ChildScopes option in the ini file & updated CONFFILES. Note, ChildScopes was already listed as deprecated there, so this branch just adds some more detail.

Approved by PS Jenkins bot, Michi Henning.