lp:~brad-marshall/charms/trusty/swift-proxy/add-haproxy-nrpe-fix-servicegroups

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~openstack-charmers-archive/charms/trusty/swift-proxy/next at revision 81

Liam Young (community): Approve on 2015-02-26

Diff: 1375 lines (+51/-610)

10 files modified

config.yaml (+6/-1)
hooks/charmhelpers/contrib/openstack/context.py (+28/-9)
hooks/charmhelpers/contrib/openstack/files/__init__.py (+0/-18)
hooks/charmhelpers/contrib/openstack/files/check_haproxy.sh (+0/-32)
hooks/charmhelpers/contrib/openstack/files/check_haproxy_queue_depth.sh (+0/-30)
hooks/charmhelpers/contrib/openstack/templates/zeromq (+14/-0)
hooks/charmhelpers/core/strutils.py (+0/-42)
hooks/charmhelpers/core/unitdata.py (+0/-477)
hooks/swift_hooks.py (+2/-0)
tests/basic_deployment.py (+1/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

81. By Brad Marshall on 2015-02-25

[bradm] Fixed merge conflicts

80. By Billy Olsen on 2015-02-19

[1chb1n,r=wolsen]

Sync charm-helpers into swift-proxy to get new pockets for vivid.
Bonus: removed lint warnigns in config.yaml

Closes-Bug: #1423680

79. By Liam Young on 2015-01-26

[gnuoy,trivial] Pre-release charmhelper sync

78. By Liam Young on 2015-01-12

[gnuoy,r=james-page] Add support for nrpe

77. By Edward Hope-Morley on 2015-01-12

[hopem,r=gnuoy]

Sync charm-helpers to get apache ssl port fix

76. By Liam Young on 2015-01-09

[bradm, gnuoy,r=jamespage] This is an update of the branch ~brad-marshall wrote to add the generation of nrpe support to the charm.

75. By Liam Young on 2015-01-08

[gnuoy, r=jamespage] Enable haproxy for when there is a single unit in a deployment

74. By Corey Bryant on 2014-12-19

[hopem,r=gnuoy] Sync charm-helpers to get fix for precise haproxy IPv6.

73. By Edward Hope-Morley on 2014-12-19

[hopem,r=billy-olsen,1chb1n]

Fixes swift prematurely notifying storage
relations that rings available.

72. By Edward Hope-Morley on 2014-12-18

[hopem,r=gnuoy]

Adds better protection against leader switches.
Reduces sync noise.