lp:~johnsca/charms/trusty/cf-uaa/port-conflicts

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~cf-charmers/charms/trusty/cf-uaa/trunk at revision 34

Cloud Foundry Charmers: Pending requested 2014-06-10

Diff: 293 lines (+110/-67)

5 files modified

hooks/charmhelpers/contrib/cloudfoundry/contexts.py (+17/-6)
hooks/charmhelpers/core/services.py (+81/-55)
hooks/config.py (+7/-1)
templates/registrar.yml (+4/-4)
templates/server.xml (+1/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

38. By Cory Johns on 2014-06-11

Removed port options as they don't add much value to change

37. By Cory Johns on 2014-06-10

Updated charm-helpers

36. By Cory Johns on 2014-06-06

Removed magical default unit behavior from RelationContext

35. By Cory Johns on 2014-06-06

Made uaa port configurable

34. By Cory Johns on 2014-06-06

Cleaned up nats relation keys

33. By Benjamin Saller on 2014-06-03

lint/test/proof fixes

32. By Cory Johns on 2014-05-29

Refactor to callback services API

R=benjamin.saller
CC=
https://codereview.appspot.com/99660043

31. By Cory Johns on 2014-05-20

Fixed find/replace error

30. By Cory Johns on 2014-05-20

Refactored to use refactored charm-helpers

R=benjamin.saller
CC=
https://codereview.appspot.com/91450049

29. By Kapil Thangavelu on 2014-05-13

update icon