Merge lp:~cprov/charms/trusty/snappy-proposed-image-builder/config-name-again into lp:~canonical-ci-engineering/charms/trusty/snappy-proposed-image-builder/trunk

Proposed by Celso Providelo
Status: Merged
Approved by: Celso Providelo
Approved revision: 14
Merged at revision: 14
Proposed branch: lp:~cprov/charms/trusty/snappy-proposed-image-builder/config-name-again
Merge into: lp:~canonical-ci-engineering/charms/trusty/snappy-proposed-image-builder/trunk
Diff against target: 11 lines (+1/-1)
1 file modified
templates/upstart.conf (+1/-1)
To merge this branch: bzr merge lp:~cprov/charms/trusty/snappy-proposed-image-builder/config-name-again
Reviewer Review Type Date Requested Status
Celso Providelo (community) Approve
Review via email: mp+261894@code.launchpad.net

Commit message

Re-fixing upstart configuration filename.

Description of the change

Re-fixing upstart configuration filename.

To post a comment you must log in.
Revision history for this message
Celso Providelo (cprov) wrote :

self-approving ... yes, I am evil today.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'templates/upstart.conf'
2--- templates/upstart.conf 2015-05-27 13:56:25 +0000
3+++ templates/upstart.conf 2015-06-13 02:28:28 +0000
4@@ -18,6 +18,6 @@
5
6 install -d -o ${SERVICE_USER} ${SERVICE_DIR}/logs
7 chdir ${SERVICE_DIR}
8- exec sudo -u ${SERVICE_USER} sh -c "./ve/bin/python3 snappy-proposed-image-builder.py -c ${SERVICE_DIR}/core-service.conf >> logs/snappy-proposed-image-builder.log 2>&1"
9+ exec sudo -u ${SERVICE_USER} sh -c "./ve/bin/python3 snappy-proposed-image-builder.py -c ${SERVICE_DIR}/snappy-proposed-service.conf >> logs/snappy-proposed-image-builder.log 2>&1"
10
11 end script

Subscribers

People subscribed via source and target branches