Merge lp:~johnsca/charms/trusty/cf-nats/port-conflicts into lp:~cf-charmers/charms/trusty/cf-nats/trunk
Proposed by
Cory Johns
Status: | Merged |
---|---|
Merged at revision: | 33 |
Proposed branch: | lp:~johnsca/charms/trusty/cf-nats/port-conflicts |
Merge into: | lp:~cf-charmers/charms/trusty/cf-nats/trunk |
Diff against target: |
263 lines (+104/-67) 4 files modified
hooks/charmhelpers/contrib/cloudfoundry/contexts.py (+17/-6) hooks/charmhelpers/core/services.py (+81/-55) hooks/config.py (+4/-4) templates/nats.yml (+2/-2) |
To merge this branch: | bzr merge lp:~johnsca/charms/trusty/cf-nats/port-conflicts |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Cloud Foundry Charmers | Pending | ||
Review via email: mp+222677@code.launchpad.net |
Description of the change
Resolve port conflicts for cf-nats
To post a comment you must log in.
Reviewers: mp+222677_ code.launchpad. net,
Message:
Please take a look.
Description:
Resolve port conflicts for cf-nats
https:/ /code.launchpad .net/~johnsca/ charms/ trusty/ cf-nats/ port-conflicts/ +merge/ 222677
(do not edit description out of merge proposal)
Please review this at https:/ /codereview. appspot. com/102270043/
Affected files (+106, -67 lines): ers/contrib/ cloudfoundry/ contexts. py ers/core/ services. py
A [revision details]
M hooks/charmhelp
M hooks/charmhelp
M hooks/config.py
M templates/nats.yml