Multiple default gateways
q
Merge branch 'master' into gateways
errors
fix 2
Merge branch 'master' of https://github.com/openstack/quantum into gateways
fix1
Merge branch 'master' of https://github.com/openstack/quantum into floatingips

Conflicts:
	quantum/plugins/openvswitch/ovs_quantum_plugin.py
12.03
Set fake rpc implementation in test_lb_quantum_agent

Fixes bug #1151806

Change-Id: I1a57f8b926960ecfa5ee832e7af8d9f9a2ad177e
Floating IPs
Floating IPs: network attr
Merge branch 'master' of https://github.com/openstack/quantum into floatingips
Merge branch 'master' of https://github.com/openstack/quantum into gateways
Merge branch 'gateways' into floatingips
1
2
3
4
4