Merge lp://staging/~1chb1n/charms/trusty/mysql/newton into lp://staging/charms/trusty/mysql

Proposed by Ryan Beisner
Status: Merged
Merged at revision: 162
Proposed branch: lp://staging/~1chb1n/charms/trusty/mysql/newton
Merge into: lp://staging/charms/trusty/mysql
Diff against target: 5281 lines (+3759/-753)
44 files modified
.bzrignore (+1/-0)
charm-helpers.yaml (+1/-0)
hooks/charmhelpers/__init__.py (+11/-13)
hooks/charmhelpers/contrib/__init__.py (+11/-13)
hooks/charmhelpers/contrib/database/__init__.py (+11/-0)
hooks/charmhelpers/contrib/database/mysql.py (+12/-0)
hooks/charmhelpers/contrib/network/__init__.py (+11/-13)
hooks/charmhelpers/contrib/network/ip.py (+59/-20)
hooks/charmhelpers/contrib/peerstorage/__init__.py (+11/-13)
hooks/charmhelpers/core/__init__.py (+11/-13)
hooks/charmhelpers/core/decorators.py (+11/-13)
hooks/charmhelpers/core/files.py (+11/-13)
hooks/charmhelpers/core/fstab.py (+11/-13)
hooks/charmhelpers/core/hookenv.py (+56/-13)
hooks/charmhelpers/core/host.py (+192/-116)
hooks/charmhelpers/core/host_factory/centos.py (+56/-0)
hooks/charmhelpers/core/host_factory/ubuntu.py (+56/-0)
hooks/charmhelpers/core/hugepage.py (+11/-13)
hooks/charmhelpers/core/kernel.py (+34/-30)
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 (+11/-13)
hooks/charmhelpers/core/services/helpers.py (+11/-13)
hooks/charmhelpers/core/strutils.py (+11/-13)
hooks/charmhelpers/core/sysctl.py (+11/-13)
hooks/charmhelpers/core/templating.py (+19/-16)
hooks/charmhelpers/core/unitdata.py (+11/-14)
hooks/charmhelpers/fetch/__init__.py (+42/-309)
hooks/charmhelpers/fetch/archiveurl.py (+11/-13)
hooks/charmhelpers/fetch/bzrurl.py (+31/-23)
hooks/charmhelpers/fetch/centos.py (+171/-0)
hooks/charmhelpers/fetch/giturl.py (+18/-17)
hooks/charmhelpers/fetch/ubuntu.py (+336/-0)
hooks/charmhelpers/osplatform.py (+19/-0)
tests/charmhelpers/__init__.py (+36/-0)
tests/charmhelpers/contrib/__init__.py (+13/-0)
tests/charmhelpers/contrib/amulet/__init__.py (+13/-0)
tests/charmhelpers/contrib/amulet/deployment.py (+97/-0)
tests/charmhelpers/contrib/amulet/utils.py (+827/-0)
tests/charmhelpers/contrib/openstack/__init__.py (+13/-0)
tests/charmhelpers/contrib/openstack/amulet/__init__.py (+13/-0)
tests/charmhelpers/contrib/openstack/amulet/deployment.py (+300/-0)
tests/charmhelpers/contrib/openstack/amulet/utils.py (+1127/-0)
To merge this branch: bzr merge lp://staging/~1chb1n/charms/trusty/mysql/newton
Reviewer Review Type Date Requested Status
David Ames (community) Approve
Review via email: mp+306554@code.staging.launchpad.net

Description of the change

Sync charm-helpers for Newton awareness

To post a comment you must log in.
162. By Ryan Beisner

Re-sync charm-helpers for Newton awareness

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_lint_check #192 mysql for 1chb1n mp306554
    LINT OK: passed

Build: http://10.245.162.208:8080/job/charm_lint_check/192/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_unit_test #109 mysql for 1chb1n mp306554
    UNIT OK: passed

Build: http://10.245.162.208:8080/job/charm_unit_test/109/

Revision history for this message
David Ames (thedac) wrote :

Ran tests, such as they are, manually as well as a quick deploy with several consumers of the shared-db relation. No regressions found.

Merging.

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: