Charm Helpers

Merge lp:~corey.bryant/charm-helpers/stable-newton into lp:charm-helpers

  1. stable-newton
  2. Merge into devel
Proposed by Corey Bryant
Status: Merged
Merged at revision: 647
Proposed branch: lp:~corey.bryant/charm-helpers/stable-newton
Merge into: lp:charm-helpers
Diff against target: 26 lines (+3/-2)
1 file modified
charmhelpers/contrib/openstack/utils.py (+3/-2)
To merge this branch: bzr merge lp:~corey.bryant/charm-helpers/stable-newton
Reviewer Review Type Date Requested Status
Ryan Beisner (community) Approve
Review via email: mp+307974@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Ryan Beisner (1chb1n) :
review: Approve

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-09-29 16:15:44 +0000
3+++ charmhelpers/contrib/openstack/utils.py 2016-10-07 16:41:51 +0000
4@@ -229,6 +229,7 @@
5 GIT_DEFAULT_BRANCHES = {
6 'liberty': 'stable/liberty',
7 'mitaka': 'stable/mitaka',
8+ 'newton': 'stable/newton',
9 'master': 'master',
10 }
11
12@@ -735,12 +736,12 @@
13
14 if projects in GIT_DEFAULT_BRANCHES.keys():
15 if projects == 'master':
16- return 'newton'
17+ return 'ocata'
18 return projects
19
20 if 'release' in projects:
21 if projects['release'] == 'master':
22- return 'newton'
23+ return 'ocata'
24 return projects['release']
25
26 return None

Subscribers

People subscribed via source and target branches