Merge lp://staging/~taoliu-7/charms/trusty/contrail-configuration/node-manager into lp://staging/~sdn-charmers/charms/trusty/contrail-configuration/trunk

Proposed by Tony Liu
Status: Merged
Merged at revision: 33
Proposed branch: lp://staging/~taoliu-7/charms/trusty/contrail-configuration/node-manager
Merge into: lp://staging/~sdn-charmers/charms/trusty/contrail-configuration/trunk
Diff against target: 135 lines (+65/-7)
5 files modified
hooks/contrail_configuration_hooks.py (+11/-7)
hooks/contrail_configuration_utils.py (+23/-0)
templates/contrail-config-nodemgr (+7/-0)
templates/contrail-config-nodemgr.conf (+12/-0)
templates/contrail-nodemgr-config.ini (+12/-0)
To merge this branch: bzr merge lp://staging/~taoliu-7/charms/trusty/contrail-configuration/node-manager
Reviewer Review Type Date Requested Status
Robert Ayres (community) Approve
Review via email: mp+272160@code.staging.launchpad.net
To post a comment you must log in.
Revision history for this message
Robert Ayres (robert-ayres) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches