lp:~marcustomlinson/unity-scopes-api/relax-process-timeout

Branch merges

Propose for merging

No branches dependent on this one.

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

Unity Team: Pending requested 2016-09-08

Diff: 92 lines (+13/-13)

3 files modified

CONFIGFILES (+5/-5)
src/scopes/internal/RegistryConfig.cpp (+2/-2)
src/scopes/internal/zmq_middleware/ZmqConfig.cpp (+6/-6)

api

Superseded for merging into lp:unity-scopes-api

Unity Team: Pending requested 2016-09-01

Diff: 106 lines (+15/-13)

4 files modified

CONFIGFILES (+5/-5)
include/unity/scopes/testing/MockScope.h (+2/-0)
src/scopes/internal/RegistryConfig.cpp (+2/-2)
src/scopes/internal/zmq_middleware/ZmqConfig.cpp (+6/-6)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

374. By Marcus Tomlinson on 2016-09-08

Merged devel

373. By Marcus Tomlinson on 2016-09-08

Up locate timeout to 1min

372. By Marcus Tomlinson on 2016-09-06

Up the maximum allowed registry timeout to 1min

371. By Marcus Tomlinson on 2016-09-01

Merged lp:~stolowski/unity-scopes-api/disable-sss-test

370. By Marcus Tomlinson on 2016-09-01

Fix stand-alone-unity-scopes-testing-headers test on Yakkety

369. By Marcus Tomlinson on 2016-08-31

Up the maximum allowed process timeout to 1min

368. By CI Train Bot Account on 2016-06-17

Releasing 1.0.6+16.10.20160617-0ubuntu1

367. By CI Train Bot Account on 2016-06-17

* 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.
* No-change rebuild.
* No-change rebuild of latest xenial trunk against current archive.

366. By CI Train Bot Account on 2016-04-13

Releasing 1.0.5+16.04.20160413.1-0ubuntu1

365. By Marcus Tomlinson on 2016-04-13

Fix version number in changelog. Fixes: #1568730
Approved by: Pawel Stolowski, PS Jenkins bot