Merge lp://staging/~mandel/location-service/trust-store-fixes into lp://staging/location-service/trunk
Status: | Approved |
---|---|
Approved by: | Michael Frey |
Approved revision: | 202 |
Proposed branch: | lp://staging/~mandel/location-service/trust-store-fixes |
Merge into: | lp://staging/location-service/trunk |
Prerequisite: | lp://staging/~mandel/location-service/tvoss-time-delta-fixes |
Diff against target: |
15 lines (+4/-2) 1 file modified
data/ubuntu-location-service-trust-stored.conf.in (+4/-2) |
To merge this branch: | bzr merge lp://staging/~mandel/location-service/trust-store-fixes |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
PS Jenkins bot | continuous-integration | Approve | |
Michael Frey (community) | Approve | ||
Review via email: mp+257908@code.staging.launchpad.net |
Commit message
Update the trust store upstart job that was broken with the move to systemd.
Description of the change
Update the trust store upstart job that was broken with the move to systemd.
Unmerged revisions
- 203. By Manuel de la Peña
-
Merged tvoss-time-
delta-fixes into trust-store-fixes. - 202. By Manuel de la Peña
-
Use the name owner change to ensure that we are stopped and started correctly.
- 201. By Manuel de la Peña
-
Revert logging and add fixes to the upstart job.
- 200. By Manuel de la Peña
-
Fix compiling errors.
- 199. By Manuel de la Peña
-
More logging to help fixing the issue. Reorg the threads to have the utgoing to be the first one.
- 198. By Manuel de la Peña
-
Merged tvoss-time-
delta-fixes into trust-store-fixes. - 197. By Manuel de la Peña
-
Merged tvoss-time-
delta-fixes into trust-store-fixes. - 196. By Manuel de la Peña
-
Log the exceptions.
- 195. By Manuel de la Peña
-
Added code according to the reviews.
- 194. By Manuel de la Peña
-
Merged verbose-logging into tvoss-time-
delta-fixes.
tested and works