Merge lp://staging/~junaidali/charms/trusty/plumgrid-director/trunk into lp://staging/~plumgrid-team/charms/trusty/plumgrid-director/trunk

Proposed by Junaid Ali
Status: Merged
Merged at revision: 33
Proposed branch: lp://staging/~junaidali/charms/trusty/plumgrid-director/trunk
Merge into: lp://staging/~plumgrid-team/charms/trusty/plumgrid-director/trunk
Diff against target: 80 lines (+26/-2)
4 files modified
hooks/pg_dir_hooks.py (+4/-1)
hooks/pg_dir_utils.py (+17/-0)
templates/kilo/00-pg.conf (+2/-1)
templates/kilo/plumgrid.conf (+3/-0)
To merge this branch: bzr merge lp://staging/~junaidali/charms/trusty/plumgrid-director/trunk
Reviewer Review Type Date Requested Status
Bilal Baqar Pending
Review via email: mp+292115@code.staging.launchpad.net
To post a comment you must log in.
31. By Bilal Baqar

Merge: Liberty/Mitaka support

32. By Bilal Baqar

Merge - Mitaka changes
- Created new relation with neutron-api-plumgrid
- getting pg creds in config
- nginx conf changes for middleware

33. By Bilal Baqar

5.1 changes
- configure-pg-sources added
- updated templates

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