« back to all changes in this revision
Viewing changes to tests/
- Committer: Salvatore Orlando
- Date: 2011-06-24 13:52:17 UTC
- mfrom: (6.1.14 quantum-trunk)
- Revision ID: salvatore.orlando@eu.citrix.com-20110624135217-h6uz1zu3fxxpf3wt
Merge trunk
Resolving conflicts
Resolving conflicts
- files added:
- README
- quantum/db
- quantum/plugins/openvswitch
- quantum/plugins/openvswitch/agent
- tests
- tests/functional
- tests/unit
- files removed:
- smoketests
- test_scripts
- files modified:
- bin/quantum
added
removed
tests/
