Juju Charms Collection
snappy-proposed-image-builder package

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

  1. Trusty Tahr (14.04)
  2. config-name
  3. Merge into trunk
Proposed by Celso Providelo
Status: Merged
Approved by: Celso Providelo
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 Approve
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.
Revision history for this message
Francis Ginther (fginther) wrote :

Approve.

review: Approve

Preview Diff

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

Subscribers

People subscribed via source and target branches