lp://qastaging/~openstack-charmers/charms/trusty/neutron-openvswitch/0mq

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp://qastaging/~openstack-charmers-archive/charms/trusty/neutron-openvswitch/next at revision 55

Liam Young (community): Approve on 2015-04-01

Ryan Beisner (community): Needs Fixing on 2015-01-16

James Page: Needs Fixing on 2014-10-22

Diff: 556 lines (+249/-90)

13 files modified

hooks/charmhelpers/contrib/openstack/amulet/deployment.py (+25/-2)
hooks/charmhelpers/contrib/openstack/templates/git.upstart (+13/-0)
hooks/charmhelpers/contrib/openstack/templates/section-zeromq (+14/-0)
hooks/charmhelpers/contrib/openstack/templates/zeromq (+0/-14)
hooks/charmhelpers/contrib/openstack/utils.py (+124/-69)
hooks/charmhelpers/core/unitdata.py (+1/-1)
hooks/neutron_ovs_hooks.py (+21/-0)
hooks/neutron_ovs_utils.py (+15/-1)
metadata.yaml (+4/-0)
templates/icehouse/neutron.conf (+2/-1)
templates/kilo/neutron.conf (+2/-0)
tests/charmhelpers/contrib/openstack/amulet/deployment.py (+25/-2)
unit_tests/test_neutron_ovs_hooks.py (+3/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

62. By James Page on 2015-04-01

Rebase

61. By James Page on 2015-04-01

Sortout topic registration

60. By James Page on 2015-03-30

Rebase, resync

59. By James Page on 2015-03-16

Make 0mq support >= kilo

58. By James Page on 2015-03-16

Rebase

57. By James Page on 2015-02-24

Add kilo zeromq template

56. By James Page on 2015-02-24

Update headers for templates

55. By James Page on 2015-02-24

Specialize configuration for juno + zeromq

54. By James Page on 2015-02-24

Rebase and resync

53. By James Page on 2015-02-24

Switch back to trunk charm-helpers