Merge lp://qastaging/~springfield-team/charms/precise/openstack-dashboard/trunk into lp://qastaging/~openstack-charmers-archive/charms/precise/openstack-dashboard/trunk
Proposed by
ChingWei Chang
| Status: | Superseded |
|---|---|
| Proposed branch: | lp://qastaging/~springfield-team/charms/precise/openstack-dashboard/trunk |
| Merge into: | lp://qastaging/~openstack-charmers-archive/charms/precise/openstack-dashboard/trunk |
| Diff against target: |
118 lines (+38/-6) 6 files modified
config.yaml (+4/-0) hooks/horizon_contexts.py (+11/-1) hooks/horizon_utils.py (+7/-1) templates/havana/local_settings.py (+3/-2) templates/icehouse/_40_router.py (+10/-0) templates/icehouse/local_settings.py (+3/-2) |
| To merge this branch: | bzr merge lp://qastaging/~springfield-team/charms/precise/openstack-dashboard/trunk |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Marco Ceppi (community) | Abstain | ||
| OpenStack Charmers | Pending | ||
|
Review via email:
|
|||
This proposal has been superseded by a proposal from 2014-05-02.
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-support
templates/
For profile-support setting
To post a comment you must log in.
Unmerged revisions
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Leaving for openstack-charmers, thanks!!