Created by David Britton on 2015-05-15 and last modified on 2015-05-15
Get this branch:
bzr branch lp:~davidpbritton/charms/trusty/haproxy/merge-services-fix
Only David Britton can upload to this branch. If you are David Britton please log in for upload directions.

Branch merges

Related bugs

Related blueprints

Branch information

David Britton

Recent revisions

98. By David Britton on 2015-05-15

- Merge in Bjorn's branch
- fix lint
- Removed 'revision', added to bzrignore
- fix proof
- fix proof make target

97. By Данило Шеган on 2015-05-15

Uncomment apt-get that got in by accident.

96. By Данило Шеган on 2015-05-15

Add exception tests.

95. By Данило Шеган on 2015-05-15

Drop useless sorting of lists containing dicts.

94. By Данило Шеган on 2015-05-15

Refactor merge_service and improve test.

93. By Данило Шеган on 2015-05-15

Ensure merging services works even when new_service has less backend servers compared to old_service.

92. By Chris Glass on 2015-05-14

Merge p:~bjornt/charms/trusty/haproxy/relation-set-fix [a=bjornt] [r=tribaal]

Sync charm-helpers to r373, bringing in the relation-set functionality where large
amounts of data can be passed via the new --file flag.

91. By Tom Haddon on 2015-05-13

[axino,r=mthaddon] Fix the queue depth check in case multiple backend names begin the same way

90. By Chris Glass on 2015-04-14

Merge lp:~free.ekanayaka/charms/trusty/haproxy/advertise-public-ip [a=free.ekanayaka] [r=tribaal]

Add a reverseproxy-relation-joined hook that will expose the unit's public IP and public SSL certificate, in case related services need it.

89. By Chris Glass on 2015-03-24

Merging lp:~free.ekanayaka/charms/trusty/haproxy/backends-support [a=free.ekanayaka] [r=tribaal]

Add support for configuring extra backends beside the default one.

Branch metadata

Branch format:
Branch format 7
Repository format:
Bazaar repository format 2a (needs bzr 1.16 or later)
Stacked on:
This branch contains Public information 
Everyone can see this information.