Merge lp://staging/~corey.bryant/charms/trusty/openstack-dashboard/fix-global-reqs into lp://staging/~openstack-charmers-archive/charms/trusty/openstack-dashboard/next
Proposed by
Corey Bryant
| Status: | Merged |
|---|---|
| Approved by: | Billy Olsen |
| Approved revision: | 68 |
| Merged at revision: | 67 |
| Proposed branch: | lp://staging/~corey.bryant/charms/trusty/openstack-dashboard/fix-global-reqs |
| Merge into: | lp://staging/~openstack-charmers-archive/charms/trusty/openstack-dashboard/next |
| Diff against target: |
1554 lines (+687/-111) 15 files modified
hooks/charmhelpers/contrib/hahelpers/cluster.py (+47/-3) hooks/charmhelpers/contrib/openstack/amulet/deployment.py (+6/-2) hooks/charmhelpers/contrib/openstack/amulet/utils.py (+122/-3) hooks/charmhelpers/contrib/openstack/context.py (+1/-1) hooks/charmhelpers/contrib/openstack/ip.py (+49/-44) hooks/charmhelpers/contrib/openstack/neutron.py (+16/-9) hooks/charmhelpers/contrib/openstack/utils.py (+21/-8) hooks/charmhelpers/core/hookenv.py (+147/-10) hooks/charmhelpers/core/host.py (+25/-7) hooks/charmhelpers/core/services/base.py (+32/-11) hooks/charmhelpers/fetch/__init__.py (+1/-1) tests/charmhelpers/contrib/amulet/utils.py (+91/-6) tests/charmhelpers/contrib/openstack/amulet/deployment.py (+6/-2) tests/charmhelpers/contrib/openstack/amulet/utils.py (+122/-3) unit_tests/test_horizon_hooks.py (+1/-1) |
| To merge this branch: | bzr merge lp://staging/~corey.bryant/charms/trusty/openstack-dashboard/fix-global-reqs |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Billy Olsen | Approve | ||
|
Review via email:
|
|||
Description of the change
See https:/
for details explaining this merge.
To post a comment you must log in.
Revision history for this message
| uosci-testing-bot (uosci-testing-bot) wrote | # |
Revision history for this message
| uosci-testing-bot (uosci-testing-bot) wrote | # |
Revision history for this message
| uosci-testing-bot (uosci-testing-bot) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
charm_lint_check #5475 openstack-
LINT OK: passed
Build: http://