Merge lp://qastaging/~springfield-team/charms/trusty/neutron-api/n1kv into lp://qastaging/~openstack-charmers-archive/charms/trusty/neutron-api/next
Proposed by
Edward Hope-Morley
| Status: | Superseded |
|---|---|
| Proposed branch: | lp://qastaging/~springfield-team/charms/trusty/neutron-api/n1kv |
| Merge into: | lp://qastaging/~openstack-charmers-archive/charms/trusty/neutron-api/next |
| Diff against target: |
144 lines (+83/-28) 3 files modified
config.yaml (+24/-0) hooks/charmhelpers/contrib/openstack/context.py (+16/-28) templates/icehouse/cisco_plugins.ini (+43/-0) |
| To merge this branch: | bzr merge lp://qastaging/~springfield-team/charms/trusty/neutron-api/n1kv |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Edward Hope-Morley | Pending | ||
|
Review via email:
|
|||
This proposal has been superseded by a proposal from 2014-11-21.
To post a comment you must log in.
Unmerged revisions
- 70. By Edward Hope-Morley
-
[hopem] synced /next
- 69. By Shiv Prasad Rao
-
Addressing review comments.
- 68. By Jorge Niedbalski
-
[all] resync with /next && charm helpers "make sync"
- 67. By Edward Hope-Morley
-
synced charm-helpers
- 66. By Edward Hope-Morley
-
synced /next
- 65. By Shiv Prasad Rao
-
syncing n1kv charmhelper changer from lp:charm-helpers
- 64. By Shiv Prasad Rao
-
fix for 1394778
- 63. By Shiv Prasad Rao
-
Cisco Nexus 1000V changes
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
