Merge lp://staging/~bac/charms/trusty/openstack-dashboard/apache-slugs into lp://staging/~yellow/charms/trusty/openstack-dashboard/dashboard-plugin
Proposed by
Brad Crittenden
| Status: | Merged |
|---|---|
| Merged at revision: | 86 |
| Proposed branch: | lp://staging/~bac/charms/trusty/openstack-dashboard/apache-slugs |
| Merge into: | lp://staging/~yellow/charms/trusty/openstack-dashboard/dashboard-plugin |
| Diff against target: |
777 lines (+356/-24) 23 files modified
Makefile (+1/-2) actions.yaml (+2/-0) actions/openstack_upgrade.py (+34/-0) config.yaml (+31/-2) hooks/charmhelpers/contrib/openstack/utils.py (+48/-0) hooks/horizon_contexts.py (+68/-2) hooks/horizon_hooks.py (+11/-4) hooks/horizon_utils.py (+8/-7) hooks/install (+20/-0) metadata.yaml (+1/-0) templates/default (+2/-0) templates/default-ssl (+2/-0) templates/essex/local_settings.py (+2/-0) templates/folsom/local_settings.py (+2/-0) templates/grizzly/local_settings.py (+2/-0) templates/havana/local_settings.py (+2/-0) templates/icehouse/local_settings.py (+8/-0) templates/juno/local_settings.py (+8/-0) tests/00-setup (+1/-0) tests/tests.yaml (+1/-1) unit_tests/test_actions_openstack_upgrade.py (+53/-0) unit_tests/test_horizon_contexts.py (+39/-3) unit_tests/test_horizon_hooks.py (+10/-3) |
| To merge this branch: | bzr merge lp://staging/~bac/charms/trusty/openstack-dashboard/apache-slugs |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Jay R. Wren (community) | Approve | ||
| j.c.sackett (community) | Approve | ||
|
Review via email:
|
|||
Description of the change
Allow the ability to add controls to the end http and https configurations. Useful for things like rewrite stanzas.
To post a comment you must log in.
Revision history for this message
| Brad Crittenden (bac) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
This branch was started based on the 'next' version of the openstack-