lp://qastaging/~tylesmit/neutron/quantum-bug-814517
- Get this branch:
- bzr branch lp://qastaging/~tylesmit/neutron/quantum-bug-814517
Branch merges
- Somik Behera: Approve (netstack-core)
- Salvatore Orlando: Approve
-
Diff: 12 lines (+1/-1)1 file modifiedquantum/common/wsgi.py (+1/-1)
Branch information
Recent revisions
- 23. By Salvatore Orlando
-
Merging branch lp:~netstack/quantum/quantum-unit-tests
Provides functionality as specified by blueprint https:/
/blueprints. launchpad. net/quantum/ +spec/api- spec-unit- tests - 22. By Salvatore Orlando
-
Applying fix for bug #804237
from branch lp:~salvatore-orlando/quantum/bug804237 - 21. By Somik Behera
-
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 - 19. By Somik Behera
-
Merging latest changes from parent repo - lp:network-service , Parent repo had approved merge proposal for merging lp:~santhom/network-service/quantum_testing_framework , which has now been merged into lp:network-service
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp://qastaging/neutron/diablo