Merge lp://staging/~gandelman-a/ubuntu/precise/quantum/UCA_2012.2.1 into lp://staging/~ubuntu-cloud-archive/ubuntu/precise/quantum/folsom

.pc/fix-quantum-configuration.patch/etc/l3_agent.ini (+1/-1)
.pc/fix-quantum-configuration.patch/etc/quantum.conf (+0/-12)
.pc/fix-quantum-configuration.patch/etc/quantum/plugins/openvswitch/ovs_quantum_plugin.ini (+1/-1)
.pc/fix-ubuntu-tests.patch/quantum/tests/unit/test_linux_ip_lib.py (+35/-0)
AUTHORS (+6/-0)
ChangeLog (+1106/-247)
PKG-INFO (+1/-1)
bin/quantum-rootwrap (+8/-0)
debian/changelog (+73/-0)
debian/control (+0/-1)
debian/rules (+1/-1)
etc/l3_agent.ini (+1/-1)
etc/quantum.conf (+0/-12)
etc/quantum/plugins/openvswitch/ovs_quantum_plugin.ini (+1/-1)
quantum.egg-info/PKG-INFO (+1/-1)
quantum.egg-info/SOURCES.txt (+2/-0)
quantum.egg-info/entry_points.txt (+1/-1)
quantum.egg-info/requires.txt (+1/-1)
quantum.egg-info/top_level.txt (+1/-1)
quantum/agent/dhcp_agent.py (+5/-0)
quantum/agent/l3_agent.py (+4/-3)
quantum/agent/linux/dhcp.py (+3/-0)
quantum/agent/linux/ip_lib.py (+40/-0)
quantum/agent/linux/iptables_manager.py (+1/-1)
quantum/agent/linux/utils.py (+8/-0)
quantum/api/v2/attributes.py (+183/-18)
quantum/api/v2/base.py (+5/-1)
quantum/api/v2/resource.py (+4/-1)
quantum/common/config.py (+1/-0)
quantum/common/utils.py (+39/-0)
quantum/db/api.py (+8/-3)
quantum/db/db_base_plugin_v2.py (+76/-25)
quantum/db/l3_db.py (+83/-64)
quantum/extensions/extensions.py (+5/-0)
quantum/extensions/l3.py (+17/-3)
quantum/openstack/common/cfg.py (+1/-1)
quantum/openstack/common/log.py (+4/-5)
quantum/openstack/common/notifier/api.py (+3/-3)
quantum/openstack/common/policy.py (+3/-2)
quantum/openstack/common/rpc/__init__.py (+9/-3)
quantum/openstack/common/rpc/amqp.py (+8/-0)
quantum/openstack/common/rpc/impl_kombu.py (+18/-12)
quantum/openstack/common/rpc/impl_qpid.py (+35/-53)
quantum/openstack/common/timeutils.py (+7/-3)
quantum/plugins/cisco/network_plugin.py (+5/-0)
quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py (+62/-81)
quantum/plugins/linuxbridge/lb_quantum_plugin.py (+4/-2)
quantum/plugins/nicira/nicira_nvp_plugin/QuantumPlugin.py (+5/-1)
quantum/plugins/nicira/nicira_nvp_plugin/nvplib.py (+9/-2)
quantum/plugins/openvswitch/agent/ovs_quantum_agent.py (+19/-16)
quantum/plugins/openvswitch/common/config.py (+1/-1)
quantum/plugins/openvswitch/ovs_quantum_plugin.py (+8/-4)
quantum/plugins/ryu/nova/vif.py (+3/-3)
quantum/quantum_plugin_base_v2.py (+62/-3)
quantum/quota.py (+13/-3)
quantum/rootwrap/filters.py (+4/-0)
quantum/tests/unit/linuxbridge/test_lb_quantum_agent.py (+54/-0)
quantum/tests/unit/test_api_v2.py (+36/-24)
quantum/tests/unit/test_attributes.py (+130/-13)
quantum/tests/unit/test_common_utils.py (+60/-0)
quantum/tests/unit/test_db_plugin.py (+267/-3)
quantum/tests/unit/test_iptables_manager.py (+24/-24)
quantum/tests/unit/test_l3_plugin.py (+190/-11)
quantum/tests/unit/test_linux_dhcp.py (+8/-0)
quantum/tests/unit/test_linux_ip_lib.py (+35/-0)
quantum/tests/unit/test_rootwrap.py (+14/-0)
quantum/vcsversion.py (+2/-2)
quantum/version.py (+1/-1)
setup.py (+1/-1)
tools/pip-requires (+1/-1)