Juju Charms Collection
ubuntu-repository-cache package

Merge lp://staging/~oddbloke/charms/trusty/ubuntu-repository-cache/update_charm-helpers into lp://staging/charms/trusty/ubuntu-repository-cache

  1. Trusty Tahr (14.04)
  2. update_charm-helpers
  3. Merge into trunk
Proposed by Dan Watkins
Status: Merged
Merge reported by: Adam Israel
Merged at revision: not available
Proposed branch: lp://staging/~oddbloke/charms/trusty/ubuntu-repository-cache/update_charm-helpers
Merge into: lp://staging/charms/trusty/ubuntu-repository-cache
Diff against target: 1658 lines (+1159/-194)
20 files modified
lib/charmhelpers/contrib/charmsupport/volumes.py (+175/-0)
lib/charmhelpers/contrib/hahelpers/cluster.py (+24/-5)
lib/charmhelpers/contrib/storage/linux/ceph.py (+6/-6)
lib/charmhelpers/contrib/storage/linux/utils.py (+1/-1)
lib/charmhelpers/contrib/unison/__init__.py (+10/-3)
lib/charmhelpers/core/decorators.py (+57/-0)
lib/charmhelpers/core/files.py (+45/-0)
lib/charmhelpers/core/hookenv.py (+94/-36)
lib/charmhelpers/core/host.py (+55/-11)
lib/charmhelpers/core/services/base.py (+12/-9)
lib/charmhelpers/core/services/helpers.py (+2/-2)
lib/charmhelpers/core/strutils.py (+42/-0)
lib/charmhelpers/core/sysctl.py (+56/-0)
lib/charmhelpers/core/unitdata.py (+477/-0)
lib/charmhelpers/fetch/__init__.py (+23/-14)
lib/charmhelpers/fetch/archiveurl.py (+7/-1)
lib/charmhelpers/fetch/giturl.py (+73/-0)
patches/unison-0001-departed_hook.patch (+0/-59)
patches/unison-0002-keyscan.patch (+0/-25)
patches/unison-0003-keytype.patch (+0/-22)
To merge this branch: bzr merge lp://staging/~oddbloke/charms/trusty/ubuntu-repository-cache/update_charm-helpers
Reviewer Review Type Date Requested Status
Adam Israel (community) Approve
Robert C Jennings (community) Approve
Review via email: mp+265645@code.staging.launchpad.net
To post a comment you must log in.
Revision history for this message
Robert C Jennings (rcj) wrote :

+1 for dropping custom stuff. I can run this through some testing of my own if you like, otherwise LGTM.

review: Approve
Revision history for this message
Adam Israel (aisrael) wrote :

Just tested and confirmed that this fixes the breakage. Thanks for the work! +1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: