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

Proposed by Celso Providelo on 2015-06-12
Status: Merged
Approved by: Celso Providelo on 2015-06-13
Approved revision: 13
Merged at revision: 13
Proposed branch: lp:~cprov/charms/trusty/snappy-proposed-image-builder/config-name
Merge into: lp:~canonical-ci-engineering/charms/trusty/snappy-proposed-image-builder/trunk
Diff against target: 12 lines (+1/-1)
1 file modified
hooks/actions.py (+1/-1)
To merge this branch: bzr merge lp:~cprov/charms/trusty/snappy-proposed-image-builder/config-name
Reviewer Review Type Date Requested Status
Francis Ginther 2015-06-12 Approve on 2015-06-12
Review via email: mp+261885@code.launchpad.net

Commit message

Fixing configuration file name.

Description of the change

Fixing configuration file name.

To post a comment you must log in.
Francis Ginther (fginther) wrote :

Approve.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'hooks/actions.py'
2--- hooks/actions.py 2015-06-05 18:00:20 +0000
3+++ hooks/actions.py 2015-06-12 19:43:13 +0000
4@@ -12,7 +12,7 @@
5 from charmhelpers.payload import (archive, execd)
6
7 SERVICE_NAME = 'snappy-proposed-image-builder'
8-SERVICE_CONFIGNAME = 'core-service.conf'
9+SERVICE_CONFIGNAME = 'snappy-proposed-service.conf'
10 REQUIRED_PACKAGES = [
11 'python-virtualenv', 'python3-dev', 'libssl-dev', 'libffi-dev',
12 'qemu-utils', 'ubuntu-device-flash', 'gcc',

Subscribers

People subscribed via source and target branches