Merge lp://staging/~tribaal/charms/trusty/landscape-client/resync-charm-helpers-landscape-trunk into lp://staging/~landscape/charms/trusty/landscape-client/trunk
Proposed by
Chris Glass
| Status: | Merged |
|---|---|
| Merged at revision: | 47 |
| Proposed branch: | lp://staging/~tribaal/charms/trusty/landscape-client/resync-charm-helpers-landscape-trunk |
| Merge into: | lp://staging/~landscape/charms/trusty/landscape-client/trunk |
| Diff against target: |
1471 lines (+1106/-49) 10 files modified
hooks/charmhelpers/core/fstab.py (+116/-0) hooks/charmhelpers/core/hookenv.py (+132/-7) hooks/charmhelpers/core/host.py (+100/-12) 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 (+102/-25) hooks/charmhelpers/fetch/archiveurl.py (+49/-4) hooks/charmhelpers/fetch/bzrurl.py (+2/-1) |
| To merge this branch: | bzr merge lp://staging/~tribaal/charms/trusty/landscape-client/resync-charm-helpers-landscape-trunk |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Fernando Correa Neto (community) | Approve | ||
| David Britton (community) | Approve | ||
| Adam Collard (community) | Approve | ||
|
Review via email:
|
|||
This proposal supersedes a proposal from 2014-09-26.
Description of the change
This branch resyncs charm-helpers to get the in-memory apt cache fixes.
Produced mechanically by:
bzr co lp:~landscape/charms/trusty/landscape-client/trunk
bzr cd trunk
make sync
bzr add .
bzr commit
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
Err... this is proposed to land in trunk. Not in ~landscape. Happy Friday?