Merge lp://staging/~gnuoy/charms/trusty/neutron-api/amulet into lp://staging/~openstack-charmers-archive/charms/trusty/neutron-api/next
Proposed by
Liam Young
Status: | Merged |
---|---|
Merged at revision: | 79 |
Proposed branch: | lp://staging/~gnuoy/charms/trusty/neutron-api/amulet |
Merge into: | lp://staging/~openstack-charmers-archive/charms/trusty/neutron-api/next |
Diff against target: |
1517 lines (+1303/-20) 23 files modified
Makefile (+12/-2) charm-helpers-tests.yaml (+5/-0) hooks/charmhelpers/contrib/python/packages.py (+2/-2) hooks/charmhelpers/core/fstab.py (+2/-2) hooks/charmhelpers/core/sysctl.py (+2/-2) hooks/charmhelpers/core/unitdata.py (+1/-1) hooks/charmhelpers/fetch/archiveurl.py (+10/-10) hooks/charmhelpers/fetch/giturl.py (+1/-1) tests/00-setup (+11/-0) tests/14-basic-precise-icehouse (+11/-0) tests/15-basic-trusty-icehouse (+9/-0) tests/16-basic-trusty-juno (+11/-0) tests/README (+53/-0) tests/basic_deployment.py (+382/-0) tests/charmhelpers/__init__.py (+38/-0) tests/charmhelpers/contrib/__init__.py (+15/-0) tests/charmhelpers/contrib/amulet/__init__.py (+15/-0) tests/charmhelpers/contrib/amulet/deployment.py (+93/-0) tests/charmhelpers/contrib/amulet/utils.py (+195/-0) tests/charmhelpers/contrib/openstack/__init__.py (+15/-0) tests/charmhelpers/contrib/openstack/amulet/__init__.py (+15/-0) tests/charmhelpers/contrib/openstack/amulet/deployment.py (+111/-0) tests/charmhelpers/contrib/openstack/amulet/utils.py (+294/-0) |
To merge this branch: | bzr merge lp://staging/~gnuoy/charms/trusty/neutron-api/amulet |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Corey Bryant | Approve | ||
Ryan Beisner (community) | Approve | ||
Review via email: mp+249929@code.staging.launchpad.net |
To post a comment you must log in.
charm_lint_check #2046 neutron-api-next for gnuoy mp249929
LINT OK: passed
Build: http:// 10.245. 162.77: 8080/job/ charm_lint_ check/2046/