Merge lp://qastaging/~bjornt/landscape-charm/haproxy-error-pages into lp://qastaging/~landscape/landscape-charm/trunk
Proposed by
Björn Tillenius
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Approved by: | Björn Tillenius | ||||
| Approved revision: | 290 | ||||
| Merged at revision: | 287 | ||||
| Proposed branch: | lp://qastaging/~bjornt/landscape-charm/haproxy-error-pages | ||||
| Merge into: | lp://qastaging/~landscape/landscape-charm/trunk | ||||
| Diff against target: |
249 lines (+122/-21) 6 files modified
charmhelpers/contrib/hahelpers/cluster.py (+25/-0) charmhelpers/core/hookenv.py (+22/-6) lib/relations/haproxy.py (+4/-9) lib/relations/tests/test_haproxy.py (+31/-0) tests/basic/test_service.py (+24/-1) tests/helpers.py (+16/-5) |
||||
| To merge this branch: | bzr merge lp://qastaging/~bjornt/landscape-charm/haproxy-error-pages | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Chris Glass (community) | Approve | ||
| Free Ekanayaka (community) | Approve | ||
| 🤖 Landscape Builder | test results | Approve | |
|
Review via email:
|
|||
Commit message
Configure haproxy error pages for non-503 errors.
The changes in charmhelpers/ is the result of a 'make sync'. It's
required to avoid a MAX_ARGS error when setting the relation data.
Description of the change
Configure haproxy error pages for non-503 errors.
The changes in charmhelpers/ is the result of a 'make sync'. It's
required to avoid a MAX_ARGS error when setting the relation data.
To post a comment you must log in.
Revision history for this message
| 🤖 Landscape Builder (landscape-builder) wrote | # |
review:
Approve
(test results)
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Command: make ci-test
Result: Success
Revno: 290
Branch: lp:~bjornt/landscape-charm/haproxy-error-pages
Jenkins: https:/