]> review.fuel-infra Code Review - openstack-build/neutron-build.git/commit
merge latest quantum branch and resolve conflicts
authorYing Liu <yinliu2@cisco.com>
Wed, 24 Aug 2011 20:36:32 +0000 (13:36 -0700)
committerYing Liu <yinliu2@cisco.com>
Wed, 24 Aug 2011 20:36:32 +0000 (13:36 -0700)
commitd85e6e59ddc9fc7ad45eed2b950ba607e0777b24
tree0a64e5276b0ac7c20994bb29fd1e02d008c322fe
parentbb6e8534f90f70087fef9a60c23bd147deb2f553
parentb6e55b41e92d0ce522d2b3856e44d247e8f50847
merge latest quantum branch and resolve conflicts
quantum/plugins/cisco/README
quantum/plugins/cisco/db/l2network_db.py
quantum/plugins/cisco/l2network_plugin.py
quantum/plugins/cisco/nexus/cisco_nexus_network_driver.py
quantum/plugins/cisco/tests/unit/test_l2networkApi.py
tests/unit/test_extensions.py