Merge lp://staging/~james-page/charms/trusty/rabbitmq-server/resync-plus-makefile-helpers into lp://staging/charms/trusty/rabbitmq-server
Proposed by
James Page
| Status: | Merged |
|---|---|
| Merged at revision: | 55 |
| Proposed branch: | lp://staging/~james-page/charms/trusty/rabbitmq-server/resync-plus-makefile-helpers |
| Merge into: | lp://staging/charms/trusty/rabbitmq-server |
| Diff against target: |
208 lines (+53/-25) 10 files modified
.bzrignore (+2/-0) Makefile (+11/-3) hooks/charmhelpers/contrib/charmsupport/nrpe.py (+5/-2) hooks/charmhelpers/contrib/storage/linux/utils.py (+12/-3) hooks/charmhelpers/fetch/__init__.py (+1/-1) hooks/rabbit_utils.py (+1/-1) hooks/rabbitmq_server_relations.py (+17/-9) revision (+1/-1) templates/rabbitmq-server (+3/-0) templates/rabbitmq.limits.conf (+0/-5) |
| To merge this branch: | bzr merge lp://staging/~james-page/charms/trusty/rabbitmq-server/resync-plus-makefile-helpers |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Liam Young (community) | Approve | ||
|
Review via email:
|
|||
Description of the change
Misc fixes:
1) resync with precise version of this charm - they should be one and the same
2) add target to Makefile - publish - which pushes to both charms
3) revert the changes to how open file ulimit is changed - pam is not effective for server processes.
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
LGTM +1