lp:~tylesmit/neutron/quantum-bug-814517

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:neutron/diablo at revision 26

Somik Behera: Approve (netstack-core) on 2011-07-27

Salvatore Orlando: Approve on 2011-07-27

Diff: 12 lines (+1/-1)

1 file modified

quantum/common/wsgi.py (+1/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

26. By Tyler Smith on 2011-07-27

Resolving Bug 814517 which caused XML to have extra whitespace.

25. By Salvatore Orlando on 2011-07-22

Apply fix for bug #797419
merging lp:~salvatore-orlando/quantum/bug797419

24. By Salvatore Orlando on 2011-07-22

Merging branch lp:~salvatore-orlando/quantum/bug802892
Fixing bug #802892

23. By Salvatore Orlando on 2011-07-22

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 on 2011-07-08

Applying fix for bug #804237
from branch lp:~salvatore-orlando/quantum/bug804237

21. By Somik Behera on 2011-06-27

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

20. By Brad Hall on 2011-06-24

Merge: bzr merge lp:~bgh/quantum/bugfixes

19. By Somik Behera on 2011-06-21

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

18. By Brad Hall on 2011-06-17

Fix typo in mysql package check

issue: https://bugs.launchpad.net/bugs/798080

17. By Brad Hall on 2011-06-09

README fixes