~openstack-charmers-archive/charms/trusty/neutron-api/trunk

Viewing all changes in revision 117.

  • Committer: Christopher Glass
  • Date: 2015-09-09 17:47:22 UTC
  • mfrom: (116.1.1 neutron-api)
  • Revision ID: christopher.glass@canonical.com-20150909174722-8139kk9gq1ypw50w
Merge lp:~bjornt/charms/trusty/neutron-api/backport-next-140 [a=bjornt, james-page] [r=tribaal]

Backport of the -next branch revision https://bazaar.launchpad.net/~openstack-charmers/charms/trusty/neutron-api/next/revision/140

Add local network driver type to defaults.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: