lp:~bloodearnest/charm-haproxy/merge-trunk-snapstore

Branch merges

Propose for merging

No branches dependent on this one.

On hold for merging into lp:~ubuntuone-pqm-team/charm-haproxy/snap-store

Guillermo Gonzalez: Approve on 2018-06-12

haproxy-team: Pending requested 2018-06-12

Diff: 5380 lines (+3150/-1126)

38 files modified

README.md (+6/-5)
charm-helpers.yaml (+2/-1)
config.yaml (+1/-1)
hooks/charmhelpers/__init__.py (+11/-13)
hooks/charmhelpers/contrib/__init__.py (+11/-13)
hooks/charmhelpers/contrib/charmsupport/__init__.py (+11/-13)
hooks/charmhelpers/contrib/charmsupport/nrpe.py (+106/-34)
hooks/charmhelpers/contrib/charmsupport/volumes.py (+11/-13)
hooks/charmhelpers/core/__init__.py (+11/-13)
hooks/charmhelpers/core/decorators.py (+11/-13)
hooks/charmhelpers/core/files.py (+43/-0)
hooks/charmhelpers/core/fstab.py (+11/-13)
hooks/charmhelpers/core/hookenv.py (+448/-63)
hooks/charmhelpers/core/host.py (+625/-155)
hooks/charmhelpers/core/host_factory/centos.py (+56/-0)
hooks/charmhelpers/core/host_factory/ubuntu.py (+56/-0)
hooks/charmhelpers/core/hugepage.py (+69/-0)
hooks/charmhelpers/core/kernel.py (+72/-0)
hooks/charmhelpers/core/kernel_factory/centos.py (+17/-0)
hooks/charmhelpers/core/kernel_factory/ubuntu.py (+13/-0)
hooks/charmhelpers/core/services/__init__.py (+11/-13)
hooks/charmhelpers/core/services/base.py (+52/-30)
hooks/charmhelpers/core/services/helpers.py (+42/-19)
hooks/charmhelpers/core/strutils.py (+41/-13)
hooks/charmhelpers/core/sysctl.py (+11/-13)
hooks/charmhelpers/core/templating.py (+40/-24)
hooks/charmhelpers/core/unitdata.py (+72/-31)
hooks/charmhelpers/fetch/__init__.py (+46/-296)
hooks/charmhelpers/fetch/archiveurl.py (+19/-15)
hooks/charmhelpers/fetch/bzrurl.py (+48/-50)
hooks/charmhelpers/fetch/centos.py (+171/-0)
hooks/charmhelpers/fetch/giturl.py (+37/-39)
hooks/charmhelpers/fetch/snap.py (+122/-0)
hooks/charmhelpers/fetch/ubuntu.py (+364/-0)
hooks/charmhelpers/osplatform.py (+25/-0)
hooks/hooks.py (+1/-1)
icon.svg (+456/-232)
metadata.yaml (+1/-0)

api

Superseded for merging into lp:charm-haproxy

haproxy-team: Pending requested 2018-06-12

Diff: 59 lines (+20/-12)

2 files modified

files/nrpe/check_haproxy_queue_depth.sh (+2/-2)
hooks/hooks.py (+18/-10)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

113. By Simon Davy on 2018-06-11

merge trunk r114, with updated charm-helpers and autocert support

112. By Thomi Richards on 2017-07-25

Bump haproxy stupidity.

111. By Thomi Richards on 2017-07-25

Merge fixes to haproxy service config handling.

110. By William Grant on 2017-05-20

Increase nagios haproxy queue depth thresholds until they're configurable.

109. By Simon Davy on 2017-03-02

make service_options optional in services config

108. By Cory Johns on 2016-11-30

[c=kos.tsakalozos, r=johnsca] Fixing failing tests

107. By Haw Loeung on 2016-11-28

Allow the specificaiton of additional nagios service groups. [r=sparkiegeek]

106. By Martin Hilton on 2016-10-25

Merge lp:~martin-hilton/charm-haproxy/000-check_haproxy-https-services [r=sparkiegeek,axino]

Update NRPE check to support Xenial.

Parse CSV from haproxy's HTTP stats interface

105. By Данило Шеган on 2016-09-20

Merge lp:~danilo/charm-haproxy/ssl-default-bind-options [r=sparkiegeek,free]

Expose global "ssl-default-bind-options" as a configuration option to allow disabling TLS 1.0.

To keep backwards compatibility, this option is not required.

104. By Cory Johns on 2016-07-21

[jamesj,r=johnsca] Add support for Xenial