Merge lp://qastaging/~yolanda.robla/charms/precise/heat/postgresql into lp://qastaging/~openstack-charmers-archive/charms/precise/heat/trunk

Proposed by Yolanda Robla
Status: Work in progress
Proposed branch: lp://qastaging/~yolanda.robla/charms/precise/heat/postgresql
Merge into: lp://qastaging/~openstack-charmers-archive/charms/precise/heat/trunk
Diff against target: 415 lines (+155/-19)
8 files modified
hooks/charmhelpers/contrib/hahelpers/cluster.py (+4/-4)
hooks/charmhelpers/contrib/openstack/context.py (+64/-11)
hooks/heat_relations.py (+33/-1)
hooks/heat_utils.py (+2/-0)
metadata.yaml (+2/-0)
revision (+1/-1)
templates/heat.conf (+2/-2)
unit_tests/test_heat_relations.py (+47/-0)
To merge this branch: bzr merge lp://qastaging/~yolanda.robla/charms/precise/heat/postgresql
Reviewer Review Type Date Requested Status
OpenStack Charmers Pending
Review via email: mp+212806@code.qastaging.launchpad.net

Description of the change

added postgresql

To post a comment you must log in.
Revision history for this message
James Page (james-page) wrote :

OK _ needs twiddling as currently no heat icehouse branch.

Unmerged revisions

24. By Yolanda Robla

resync charmhelper

23. By Yolanda Robla

added postgresql support

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches