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

Proposed by Yolanda Robla
Status: Merged
Merged at revision: 52
Proposed branch: lp:~yolanda.robla/charms/precise/keystone/add_heat
Merge into: lp:~charmers/charms/precise/keystone/trunk
Diff against target: 14 lines (+5/-1)
1 file modified
hooks/keystone_hooks.py (+5/-1)
To merge this branch: bzr merge lp:~yolanda.robla/charms/precise/keystone/add_heat
Reviewer Review Type Date Requested Status
charmers Pending
Review via email: mp+196584@code.launchpad.net

Description of the change

Added heat service

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
=== modified file 'hooks/keystone_hooks.py'
--- hooks/keystone_hooks.py 2013-11-12 16:28:10 +0000
+++ hooks/keystone_hooks.py 2013-11-25 16:01:28 +0000
@@ -95,7 +95,11 @@
95 "ceilometer": {95 "ceilometer": {
96 "type": "metering",96 "type": "metering",
97 "desc": "Ceilometer Metering Service"97 "desc": "Ceilometer Metering Service"
98 }98 },
99 "heat": {
100 "type": "orchestration",
101 "desc": "Heat orchestration Service"
102 },
99}103}
100104
101105

Subscribers

People subscribed via source and target branches

to all changes: