Merge lp:~niedbalski/charms/trusty/keystone/fix-lp-1308557 into lp:~openstack-charmers-archive/charms/trusty/keystone/trunk

Proposed by Jorge Niedbalski
Status: Merged
Merged at revision: 63
Proposed branch: lp:~niedbalski/charms/trusty/keystone/fix-lp-1308557
Merge into: lp:~openstack-charmers-archive/charms/trusty/keystone/trunk
Diff against target: 10 lines (+1/-1)
1 file modified
hooks/charmhelpers/fetch/__init__.py (+1/-1)
To merge this branch: bzr merge lp:~niedbalski/charms/trusty/keystone/fix-lp-1308557
Reviewer Review Type Date Requested Status
Juan L. Negron (community) Approve
Marco Ceppi (community) Abstain
Review via email: mp+217111@code.launchpad.net

Description of the change

To post a comment you must log in.
Revision history for this message
Marco Ceppi (marcoceppi) wrote :

Leaving for openstack-charmers

review: Abstain
Revision history for this message
Juan L. Negron (negronjl) wrote :

LGTM

review: Approve
Revision history for this message
Juan L. Negron (negronjl) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'hooks/charmhelpers/fetch/__init__.py'
--- hooks/charmhelpers/fetch/__init__.py 2014-03-27 10:54:38 +0000
+++ hooks/charmhelpers/fetch/__init__.py 2014-04-24 17:48:17 +0000
@@ -184,7 +184,7 @@
184 apt.write(PROPOSED_POCKET.format(release))184 apt.write(PROPOSED_POCKET.format(release))
185 if key:185 if key:
186 subprocess.check_call(['apt-key', 'adv', '--keyserver',186 subprocess.check_call(['apt-key', 'adv', '--keyserver',
187 'keyserver.ubuntu.com', '--recv',187 'hkp://keyserver.ubuntu.com:80', '--recv',
188 key])188 key])
189189
190190

Subscribers

People subscribed via source and target branches