Merge lp:~yolanda.robla/charms/precise/keystone/add_heat_cfn into lp:~charmers/charms/precise/keystone/trunk

Proposed by Yolanda Robla on 2013-11-27
Status: Merged
Merged at revision: 53
Proposed branch: lp:~yolanda.robla/charms/precise/keystone/add_heat_cfn
Merge into: lp:~charmers/charms/precise/keystone/trunk
Diff against target: 24 lines (+6/-2)
2 files modified
hooks/keystone_hooks.py (+5/-1)
revision (+1/-1)
To merge this branch: bzr merge lp:~yolanda.robla/charms/precise/keystone/add_heat_cfn
Reviewer Review Type Date Requested Status
James Page 2013-12-18 Approve on 2013-12-19
Marco Ceppi 2013-11-27 Abstain on 2013-12-18
Review via email: mp+196867@code.launchpad.net

Description of the change

Added Heat CFN service

To post a comment you must log in.
Marco Ceppi (marcoceppi) wrote :

Deferring to ~openstack-charmers

review: Abstain
James Page (james-page) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'hooks/keystone_hooks.py'
2--- hooks/keystone_hooks.py 2013-11-25 19:58:33 +0000
3+++ hooks/keystone_hooks.py 2013-11-27 11:25:34 +0000
4@@ -98,8 +98,12 @@
5 },
6 "heat": {
7 "type": "orchestration",
8- "desc": "Heat Orchestration Service"
9+ "desc": "Heat Orchestration API"
10 },
11+ "heat-cfn": {
12+ "type": "cloudformation",
13+ "desc": "Heat CloudFormation API"
14+ }
15 }
16
17
18
19=== modified file 'revision'
20--- revision 2013-11-25 19:58:33 +0000
21+++ revision 2013-11-27 11:25:34 +0000
22@@ -1,1 +1,1 @@
23-227
24+228

Subscribers

People subscribed via source and target branches

to all changes: