Merge lp://staging/~james-page/charm-helpers/vpp-rebase into lp://staging/~gnuoy/charm-helpers/cisco-vpp

Proposed by James Page
Status: Merged
Merged at revision: 399
Proposed branch: lp://staging/~james-page/charm-helpers/vpp-rebase
Merge into: lp://staging/~gnuoy/charm-helpers/cisco-vpp
Diff against target: 5730 lines (+3512/-430)
67 files modified
VERSION (+1/-1)
charmhelpers/cli/__init__.py (+32/-5)
charmhelpers/cli/commands.py (+5/-4)
charmhelpers/cli/hookenv.py (+23/-0)
charmhelpers/contrib/amulet/utils.py (+239/-9)
charmhelpers/contrib/benchmark/__init__.py (+3/-1)
charmhelpers/contrib/database/mysql.py (+3/-0)
charmhelpers/contrib/network/ufw.py (+46/-3)
charmhelpers/contrib/openstack/amulet/deployment.py (+38/-4)
charmhelpers/contrib/openstack/amulet/utils.py (+361/-51)
charmhelpers/contrib/openstack/context.py (+47/-34)
charmhelpers/contrib/openstack/templates/ceph.conf (+6/-6)
charmhelpers/contrib/openstack/templating.py (+2/-2)
charmhelpers/contrib/openstack/utils.py (+77/-23)
charmhelpers/contrib/peerstorage/__init__.py (+5/-4)
charmhelpers/contrib/python/packages.py (+2/-0)
charmhelpers/contrib/storage/linux/ceph.py (+6/-6)
charmhelpers/contrib/storage/linux/utils.py (+4/-3)
charmhelpers/contrib/unison/__init__.py (+23/-8)
charmhelpers/coordinator.py (+607/-0)
charmhelpers/core/files.py (+45/-0)
charmhelpers/core/hookenv.py (+192/-40)
charmhelpers/core/host.py (+31/-5)
charmhelpers/core/services/base.py (+12/-9)
charmhelpers/core/services/helpers.py (+1/-2)
charmhelpers/core/unitdata.py (+61/-17)
charmhelpers/fetch/__init__.py (+31/-14)
charmhelpers/fetch/archiveurl.py (+7/-1)
charmhelpers/fetch/giturl.py (+1/-1)
docs/_extensions/automembersummary.py (+86/-0)
docs/api/charmhelpers.coordinator.rst (+10/-0)
docs/api/charmhelpers.core.decorators.rst (+7/-0)
docs/api/charmhelpers.core.fstab.rst (+7/-0)
docs/api/charmhelpers.core.hookenv.rst (+12/-0)
docs/api/charmhelpers.core.host.rst (+12/-0)
docs/api/charmhelpers.core.rst (+11/-38)
docs/api/charmhelpers.core.services.base.rst (+12/-0)
docs/api/charmhelpers.core.services.helpers.rst (+12/-0)
docs/api/charmhelpers.core.services.rst (+12/-0)
docs/api/charmhelpers.core.strutils.rst (+7/-0)
docs/api/charmhelpers.core.sysctl.rst (+7/-0)
docs/api/charmhelpers.core.templating.rst (+7/-0)
docs/api/charmhelpers.core.unitdata.rst (+7/-0)
docs/api/charmhelpers.rst (+4/-2)
docs/api/modules.rst (+0/-7)
docs/conf.py (+4/-1)
setup.py (+22/-1)
test_requirements.txt (+3/-1)
tests/cli/test_cmdline.py (+56/-9)
tests/contrib/amulet/test_utils.py (+105/-0)
tests/contrib/benchmark/test_benchmark.py (+17/-13)
tests/contrib/hahelpers/test_apache_utils.py (+1/-1)
tests/contrib/network/test_ufw.py (+72/-0)
tests/contrib/openstack/test_openstack_utils.py (+34/-10)
tests/contrib/openstack/test_os_contexts.py (+60/-1)
tests/contrib/peerstorage/test_peerstorage.py (+7/-7)
tests/contrib/python/test_debug.py (+1/-1)
tests/contrib/storage/test_linux_ceph.py (+11/-11)
tests/contrib/storage/test_linux_storage_utils.py (+11/-2)
tests/contrib/unison/test_unison.py (+58/-1)
tests/coordinator/test_coordinator.py (+535/-0)
tests/core/test_files.py (+32/-0)
tests/core/test_hookenv.py (+232/-31)
tests/core/test_host.py (+33/-1)
tests/core/test_services.py (+13/-7)
tests/fetch/test_archiveurl.py (+21/-3)
tests/fetch/test_fetch.py (+60/-29)
To merge this branch: bzr merge lp://staging/~james-page/charm-helpers/vpp-rebase
Reviewer Review Type Date Requested Status
Liam Young Approve
Review via email: mp+267916@code.staging.launchpad.net
To post a comment you must log in.
Revision history for this message
Liam Young (gnuoy) 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

to all changes: