Merge lp://qastaging/~springfield-team/charms/trusty/openstack-dashboard/next into lp://qastaging/~openstack-charmers-archive/charms/trusty/openstack-dashboard/next
Proposed by
Shiv Prasad Rao
Status: | Superseded |
---|---|
Proposed branch: | lp://qastaging/~springfield-team/charms/trusty/openstack-dashboard/next |
Merge into: | lp://qastaging/~openstack-charmers-archive/charms/trusty/openstack-dashboard/next |
Diff against target: |
205 lines (+62/-2) 8 files modified
config.yaml (+3/-0) hooks/horizon_contexts.py (+11/-0) hooks/horizon_utils.py (+9/-0) templates/havana/local_settings.py (+7/-1) templates/icehouse/_40_router.py (+10/-0) templates/icehouse/local_settings.py (+6/-1) unit_tests/test_horizon_contexts.py (+14/-0) unit_tests/test_horizon_utils.py (+2/-0) |
To merge this branch: | bzr merge lp://qastaging/~springfield-team/charms/trusty/openstack-dashboard/next |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Liam Young (community) | Needs Fixing | ||
Jorge Niedbalski (community) | Approve | ||
OpenStack Charmers | Pending | ||
Review via email: mp+231654@code.qastaging.launchpad.net |
This proposal has been superseded by a proposal from 2014-09-18.
Description of the change
This merge proposal is prepared for supporting Cisco Nexus 1000V dashboard for its related extension tab/panel.
config.yaml
New parameter for supporting Cisco N1KV specific policy profile profile-support.
hooks/horizon_
Context logic to retrieve profile
templates/
For profile-support setting
Please refer to the old merge proposal for context:
https:/
Thanks,
To post a comment you must log in.
Please run a 'make lint' and clean the reported errors.
hooks/horizon_ contexts. py:87:80: E501 line too long (93 > 79 characters) utils.py: 43:80: E501 line too long (91 > 79 characters) test_horizon_ utils.py: 48:80: E501 line too long (102 > 79 characters)
hooks/horizon_
unit_tests/
After getting this fixed, LGTM.