Merge lp://qastaging/~mvo/snappy/15.04-lp1490574-systemd-type-forking into lp://qastaging/~snappy-dev/snappy/15.04-deprecated
Proposed by
Michael Vogt
| Status: | Merged |
|---|---|
| Approved by: | Michael Vogt |
| Approved revision: | 470 |
| Merged at revision: | 478 |
| Proposed branch: | lp://qastaging/~mvo/snappy/15.04-lp1490574-systemd-type-forking |
| Merge into: | lp://qastaging/~snappy-dev/snappy/15.04-deprecated |
| Diff against target: |
104 lines (+34/-7) 5 files modified
docs/meta.md (+3/-1) snappy/click.go (+1/-0) snappy/click_test.go (+25/-4) snappy/snapp.go (+1/-0) systemd/systemd.go (+4/-2) |
| To merge this branch: | bzr merge lp://qastaging/~mvo/snappy/15.04-lp1490574-systemd-type-forking |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Michael Vogt (community) | Approve | ||
| John Lenton (community) | Approve | ||
|
Review via email:
|
|||
Commit message
Add support for "forking"
Description of the change
Backport of the trunk branch that adds "type: forking" to the services yaml to support daemons that fork with systemd.
To post a comment you must log in.
Revision history for this message
| John Lenton (chipaca) | # |
review:
Approve
Revision history for this message
| Snappy Tarmac (snappydevtarmac) wrote | # |
Revision history for this message
| Snappy Tarmac (snappydevtarmac) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Attempt to merge into lp:snappy/15.04 failed due to conflicts:
text conflict in snappy/click.go
text conflict in snappy/
text conflict in systemd/systemd.go