]> review.fuel-infra Code Review - openstack-build/neutron-build.git/commit
Merge trunk
authorSalvatore Orlando <salvatore.orlando@eu.citrix.com>
Fri, 24 Jun 2011 13:52:17 +0000 (14:52 +0100)
committerSalvatore Orlando <salvatore.orlando@eu.citrix.com>
Fri, 24 Jun 2011 13:52:17 +0000 (14:52 +0100)
commita94c424f895b8f168f55311a147a300d11ddeb5a
tree2d65ccce9296fa9e160c36f515958b27a79054dc
parentcc07877e10b241b398db9fcd6e1c9781236b2a12
parentfdfa94c8ae23ff4c47dc9b0fd70c033f0f08b960
Merge trunk
Resolving conflicts
quantum/api/__init__.py
quantum/api/networks.py
quantum/api/ports.py
quantum/common/wsgi.py
quantum/manager.py
quantum/plugins/SamplePlugin.py