Merge lp://qastaging/~tribaal/charms/trusty/ntp/ntp-charm-helpers-sync into lp://qastaging/charms/trusty/ntp
Proposed by
Chris Glass
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Merged at revision: | 14 | ||||
| Proposed branch: | lp://qastaging/~tribaal/charms/trusty/ntp/ntp-charm-helpers-sync | ||||
| Merge into: | lp://qastaging/charms/trusty/ntp | ||||
| Diff against target: |
1240 lines (+637/-112) 6 files modified
hooks/charmhelpers/core/fstab.py (+116/-0) hooks/charmhelpers/core/hookenv.py (+184/-25) hooks/charmhelpers/core/host.py (+105/-19) hooks/charmhelpers/fetch/__init__.py (+214/-66) hooks/charmhelpers/fetch/archiveurl.py (+15/-0) hooks/charmhelpers/fetch/bzrurl.py (+3/-2) |
||||
| To merge this branch: | bzr merge lp://qastaging/~tribaal/charms/trusty/ntp/ntp-charm-helpers-sync | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Liam Young (community) | Approve | ||
|
Review via email:
|
|||
Description of the change
This branch updates charm-helpers to the latest version to let the charm make use of the recently introduced "retry" logic around apt methods (the charm will wait and retry should it fail to acquire the apt lock).
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 and amulet test passed