Merge lp:~adam-collard/charms/trusty/swift-storage/conditional-service-restart-stable into lp:~openstack-charmers-archive/charms/trusty/swift-storage/trunk
Status: | Merged |
---|---|
Merged at revision: | 70 |
Proposed branch: | lp:~adam-collard/charms/trusty/swift-storage/conditional-service-restart-stable |
Merge into: | lp:~openstack-charmers-archive/charms/trusty/swift-storage/trunk |
Diff against target: |
194 lines (+19/-49) 7 files modified
hooks/charmhelpers/cli/__init__.py (+1/-5) hooks/charmhelpers/cli/commands.py (+4/-4) hooks/charmhelpers/contrib/openstack/utils.py (+7/-5) hooks/charmhelpers/contrib/storage/linux/utils.py (+3/-2) hooks/charmhelpers/core/hookenv.py (+1/-20) hooks/charmhelpers/core/host.py (+2/-2) tests/basic_deployment.py (+1/-11) |
To merge this branch: | bzr merge lp:~adam-collard/charms/trusty/swift-storage/conditional-service-restart-stable |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Liam Young (community) | Approve | ||
Review via email: mp+270030@code.launchpad.net |
Description of the change
Backport r79 to stable.
See https:/
"This branch prevents the swift-storage charm from thinking there was an OpenStack upgrade available at every config-changed.
I had to update the Amulet tests because they were incorrectly asserting that all of the swift services should have been restarted following a change to object-
This relies on stable charm-helpers branch from https:/
charm_lint_check #9318 swift-storage for adam-collard mp270030
LINT OK: passed
Build: http:// 10.245. 162.77: 8080/job/ charm_lint_ check/9318/