lp://staging/~bjornt/charms/trusty/neutron-api/next-r140-amulet-fixes

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp://staging/~openstack-charmers-archive/charms/trusty/neutron-api/next at revision 144

Liam Young (community): Approve on 2015-09-28

Diff: 14 lines (+2/-2)

1 file modified

tests/basic_deployment.py (+2/-2)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

141. By Björn Tillenius on 2015-09-10

Fix amulet failures.

140. By Chris Glass on 2015-09-09

Merge lp:~james-page/charms/trusty/neutron-api/ml2-local-types [a=james-page] [r=tribaal]

Add local network driver type to defaults.

139. By James Page on 2015-09-09

[1chb1n,r=james-page] Resync helpers, update amulet tests to avoid races, enable vivid-kilo testing.

138. By James Page on 2015-09-04

[project-calico,r=james-page] Add support for Calico plugin

137. By James Page on 2015-09-03

[trivial] Switch default package to -common to enable liberty support

136. By Liam Young on 2015-09-03

[gnuoy,trivial] Charmhelper sync (+1'd by mojo)

135. By James Page on 2015-09-02

[bbaqar,r=james-page] Add support for PLUMgrid SDN

134. By Liam Young on 2015-08-19

[gnuoy,trivial] Charmhelper sync (+1'd by mojo)

133. By Corey Bryant on 2015-08-18

[corey.bryant,r=trivial] Sync charm-helpers to pick up Liberty support.

132. By Liam Young on 2015-08-12

[gnuoy, r=jamespage] Add support for neutron-plugin-api-subordinate relation