Merge lp://staging/~tribaal/charms/trusty/ntpmaster/resync-charm-helpers into lp://staging/charms/trusty/ntpmaster
Proposed by
Chris Glass
| Status: | Merged |
|---|---|
| Merged at revision: | 11 |
| Proposed branch: | lp://staging/~tribaal/charms/trusty/ntpmaster/resync-charm-helpers |
| Merge into: | lp://staging/charms/trusty/ntpmaster |
| Diff against target: |
2155 lines (+1453/-133) 12 files modified
.bzrignore (+1/-0) Makefile (+8/-2) hooks/charmhelpers/core/fstab.py (+116/-0) hooks/charmhelpers/core/hookenv.py (+215/-29) hooks/charmhelpers/core/host.py (+167/-23) hooks/charmhelpers/core/services/__init__.py (+2/-0) hooks/charmhelpers/core/services/base.py (+313/-0) hooks/charmhelpers/core/services/helpers.py (+239/-0) hooks/charmhelpers/core/templating.py (+51/-0) hooks/charmhelpers/fetch/__init__.py (+274/-73) hooks/charmhelpers/fetch/archiveurl.py (+64/-4) hooks/charmhelpers/fetch/bzrurl.py (+3/-2) |
| To merge this branch: | bzr merge lp://staging/~tribaal/charms/trusty/ntpmaster/resync-charm-helpers |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| David Britton (community) | Approve | ||
|
Review via email:
|
|||
Description of the change
This branch resyncs charm-helpers to pull in a fix where the apt-cache was not built in-memory and was causing some locking race conditions (see https:/
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
Looks great Chris, committed.