Merge lp:~pjdc/charms/precise/ceph-osd/fix-quantum-dot-list into lp:~charmers/charms/precise/ceph-osd/trunk

Proposed by Paul Collins
Status: Merged
Merged at revision: 11
Proposed branch: lp:~pjdc/charms/precise/ceph-osd/fix-quantum-dot-list
Merge into: lp:~charmers/charms/precise/ceph-osd/trunk
Diff against target: 12 lines (+1/-1)
1 file modified
hooks/utils.py (+1/-1)
To merge this branch: bzr merge lp:~pjdc/charms/precise/ceph-osd/fix-quantum-dot-list
Reviewer Review Type Date Requested Status
Jim Baker (community) Approve
charmers Pending
Review via email: mp+145242@code.launchpad.net

Description of the change

use ceph.list, not quantum.list

To post a comment you must log in.
Revision history for this message
Jim Baker (jimbaker) wrote :

+1, LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'hooks/utils.py'
--- hooks/utils.py 2012-11-12 09:36:03 +0000
+++ hooks/utils.py 2013-01-28 20:52:22 +0000
@@ -72,7 +72,7 @@
72 with open('/etc/apt/sources.list.d/cloud-archive.list', 'w') as apt:72 with open('/etc/apt/sources.list.d/cloud-archive.list', 'w') as apt:
73 apt.write(CLOUD_ARCHIVE.format(pocket))73 apt.write(CLOUD_ARCHIVE.format(pocket))
74 if source.startswith('http:'):74 if source.startswith('http:'):
75 with open('/etc/apt/sources.list.d/quantum.list', 'w') as apt:75 with open('/etc/apt/sources.list.d/ceph.list', 'w') as apt:
76 apt.write("deb " + source + "\n")76 apt.write("deb " + source + "\n")
77 key = config_get('key')77 key = config_get('key')
78 if key:78 if key:

Subscribers

People subscribed via source and target branches