Merge lp://staging/~marcustomlinson/unity-scopes-api/relax-process-timeout into lp://staging/unity-scopes-api/devel
Proposed by
Marcus Tomlinson
| Status: | Merged |
|---|---|
| Merged at revision: | 687 |
| Proposed branch: | lp://staging/~marcustomlinson/unity-scopes-api/relax-process-timeout |
| Merge into: | lp://staging/unity-scopes-api/devel |
| Diff against target: |
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) |
| To merge this branch: | bzr merge lp://staging/~marcustomlinson/unity-scopes-api/relax-process-timeout |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Unity Team | Pending | ||
|
Review via email:
|
|||
Commit message
Up the maximum allowed process timeout to 1min
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
