Juju Charms Collection
thruk-agent package

Merge lp://qastaging/~xavpaice/charms/trusty/thruk-agent/trunk into lp://qastaging/~canonical-bootstack/charms/trusty/thruk-agent/trunk

  1. Trusty Tahr (14.04)
  2. trunk
  3. Merge into trunk
Proposed by Xav Paice
Status: Merged
Approved by: James Troup
Approved revision: 35
Merged at revision: 35
Proposed branch: lp://qastaging/~xavpaice/charms/trusty/thruk-agent/trunk
Merge into: lp://qastaging/~canonical-bootstack/charms/trusty/thruk-agent/trunk
Diff against target: 4790 lines (+3050/-815)
33 files modified
charm-helpers.yaml (+1/-0)
config.yaml (+18/-4)
hooks/actions.py (+17/-0)
hooks/charmhelpers/__init__.py (+72/-13)
hooks/charmhelpers/core/__init__.py (+11/-13)
hooks/charmhelpers/core/decorators.py (+11/-13)
hooks/charmhelpers/core/files.py (+43/-0)
hooks/charmhelpers/core/fstab.py (+11/-13)
hooks/charmhelpers/core/hookenv.py (+530/-56)
hooks/charmhelpers/core/host.py (+629/-155)
hooks/charmhelpers/core/host_factory/centos.py (+72/-0)
hooks/charmhelpers/core/host_factory/ubuntu.py (+89/-0)
hooks/charmhelpers/core/hugepage.py (+69/-0)
hooks/charmhelpers/core/kernel.py (+72/-0)
hooks/charmhelpers/core/kernel_factory/centos.py (+17/-0)
hooks/charmhelpers/core/kernel_factory/ubuntu.py (+13/-0)
hooks/charmhelpers/core/services/__init__.py (+11/-13)
hooks/charmhelpers/core/services/base.py (+54/-32)
hooks/charmhelpers/core/services/helpers.py (+42/-19)
hooks/charmhelpers/core/strutils.py (+96/-15)
hooks/charmhelpers/core/sysctl.py (+11/-13)
hooks/charmhelpers/core/templating.py (+40/-24)
hooks/charmhelpers/core/unitdata.py (+72/-31)
hooks/charmhelpers/fetch/__init__.py (+54/-288)
hooks/charmhelpers/fetch/archiveurl.py (+19/-15)
hooks/charmhelpers/fetch/bzrurl.py (+48/-50)
hooks/charmhelpers/fetch/centos.py (+171/-0)
hooks/charmhelpers/fetch/giturl.py (+37/-39)
hooks/charmhelpers/fetch/snap.py (+122/-0)
hooks/charmhelpers/fetch/ubuntu.py (+568/-0)
hooks/charmhelpers/osplatform.py (+25/-0)
hooks/install (+4/-9)
hooks/services.py (+1/-0)
To merge this branch: bzr merge lp://qastaging/~xavpaice/charms/trusty/thruk-agent/trunk
Reviewer Review Type Date Requested Status
James Troup (community) Approve
Review via email: mp+327579@code.qastaging.launchpad.net
To post a comment you must log in.
Revision history for this message
James Troup (elmo) wrote :

LGTM

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