Merge lp:~corey.bryant/charm-helpers/ocata-uca into lp:charm-helpers

Proposed by Corey Bryant
Status: Merged
Merged at revision: 663
Proposed branch: lp:~corey.bryant/charm-helpers/ocata-uca
Merge into: lp:charm-helpers
Diff against target: 16 lines (+3/-3)
1 file modified
charmhelpers/contrib/openstack/utils.py (+3/-3)
To merge this branch: bzr merge lp:~corey.bryant/charm-helpers/ocata-uca
Reviewer Review Type Date Requested Status
charmers Pending
Review via email: mp+312267@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'charmhelpers/contrib/openstack/utils.py'
2--- charmhelpers/contrib/openstack/utils.py 2016-11-28 16:54:19 +0000
3+++ charmhelpers/contrib/openstack/utils.py 2016-12-01 15:37:24 +0000
4@@ -549,9 +549,9 @@
5 'newton': 'xenial-updates/newton',
6 'newton/updates': 'xenial-updates/newton',
7 'newton/proposed': 'xenial-proposed/newton',
8- 'zesty': 'zesty-updates/ocata',
9- 'zesty/updates': 'xenial-updates/ocata',
10- 'zesty/proposed': 'xenial-proposed/ocata',
11+ 'ocata': 'xenial-updates/ocata',
12+ 'ocata/updates': 'xenial-updates/ocata',
13+ 'ocata/proposed': 'xenial-proposed/ocata',
14 }
15
16 try:

Subscribers

People subscribed via source and target branches