From: Somik Behera <somik@nicira.com>
Date: Mon, 27 Jun 2011 23:34:28 +0000 (-0700)
Subject: Merging dan wendlandt's bugfixes for Bug #800466 and improvements that enable Quantum... 
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=5d23ba259811c2f05d3fcb1296051b003bcf4ef3;p=openstack-build%2Fneutron-build.git

Merging dan wendlandt's bugfixes for Bug #800466 and improvements that enable Quantum to seamlessly
run on KVM!


removed:
  quantum/plugins/openvswitch/agent/set_external_ids.sh
added:
  tools/batch_config.py
renamed:
  quantum/plugins/openvswitch/agent/install.sh => quantum/plugins/openvswitch/agent/xenserver_install.sh
modified:
  quantum/cli.py
  quantum/db/api.py
  quantum/plugins/openvswitch/README
  quantum/plugins/openvswitch/agent/ovs_quantum_agent.py
  quantum/plugins/openvswitch/ovs_db.py
  quantum/plugins/openvswitch/ovs_models.py
  quantum/plugins/openvswitch/ovs_quantum_plugin.ini
  quantum/plugins/openvswitch/ovs_quantum_plugin.py
pending merges:
  Dan Wendlandt 2011-06-27 fix pep8 introduced by trunk merge
    Dan Wendlandt 2011-06-27 [merge] merge
    Dan Wendlandt 2011-06-27 more pep8 goodness
    Dan Wendlandt 2011-06-25 refactor batch_config, allow multiple attaches with the empty string
    Dan Wendlandt 2011-06-21 [merge] merge and pep8 cleanup
    Dan Wendlandt 2011-06-21 add example to usage string for batch_config.py
    Dan Wendlandt 2011-06-21 Bug fixes and clean-up, including supporting libvirt
---

5d23ba259811c2f05d3fcb1296051b003bcf4ef3