summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "Add option to make exception format errors fatal."Jenkins2012-12-191-2/+16
|\
| * Add option to make exception format errors fatal.Dan Prince2012-12-181-2/+16
* | Merge "Import cfg module in extract_opts.py."Jenkins2012-12-191-0/+1
|\ \
| * | Import cfg module in extract_opts.py.Dan Prince2012-12-181-0/+1
| |/
* | Merge "Update command on devref doc"Jenkins2012-12-191-1/+1
|\ \
| * | Update command on devref docSulochan Acharya2012-12-141-1/+1
* | | Merge "Fixed deleting instance booted from invalid vol"Jenkins2012-12-192-2/+28
|\ \ \
| * | | Fixed deleting instance booted from invalid volUnmesh Gurjar2012-12-142-2/+28
* | | | Merge "Fix API samples generation."Jenkins2012-12-191-2/+5
|\ \ \ \
| * | | | Fix API samples generation.Matthew Treinish2012-12-171-2/+5
* | | | | Merge "Remove the WillNotSchedule exception."Jenkins2012-12-191-4/+0
|\ \ \ \ \
| * | | | | Remove the WillNotSchedule exception.Dan Prince2012-12-161-4/+0
* | | | | | Merge "Allow specification of libvirt guest interface backend driver"Jenkins2012-12-192-0/+7
|\ \ \ \ \ \
| * | | | | | Allow specification of libvirt guest interface backend driverDaniel P. Berrange2012-12-182-0/+7
* | | | | | | Fix typos in vncserver_listen config param help descriptionDaniel P. Berrange2012-12-181-1/+1
|/ / / / / /
* | | | | | Merge "Move network_driver into new nova.network.driver"Jenkins2012-12-185-18/+50
|\ \ \ \ \ \
| * | | | | | Move network_driver into new nova.network.driverMark McLoughlin2012-12-165-18/+50
* | | | | | | Merge "network/api add_fixed_ip correctly passes uuid"Jenkins2012-12-181-1/+1
|\ \ \ \ \ \ \
| * | | | | | | network/api add_fixed_ip correctly passes uuidTrey Morris2012-12-181-1/+1
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge "Imported Translations from Transifex"OpenStack Jenkins2012-12-181-251/+278
|\ \ \ \ \ \ \
| * | | | | | | Imported Translations from TransifexOpenStack Jenkins2012-12-181-251/+278
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge "Move DNS manager options into network.manager"Jenkins2012-12-183-13/+12
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | Move DNS manager options into network.managerMark McLoughlin2012-12-163-13/+12
| | |_|/ / / | |/| | | |
* | | | | | Merge "Traceback when user doesn't have permission."Jenkins2012-12-181-0/+3
|\ \ \ \ \ \
| * | | | | | Traceback when user doesn't have permission.Chuck Short2012-12-181-0/+3
* | | | | | | Merge "removed duplicate function definitions"Jenkins2012-12-181-8/+0
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | removed duplicate function definitionsTrey Morris2012-12-181-8/+0
| | |_|/ / / | |/| | | |
* | | | | | Merge "Properly remove the time override in quota tests."Jenkins2012-12-181-7/+3
|\ \ \ \ \ \
| * | | | | | Properly remove the time override in quota tests.Robert Collins2012-12-181-7/+3
* | | | | | | Merge "Move TimeOverride to the general reusable-test-helper place."Jenkins2012-12-182-11/+10
|\| | | | | | | |/ / / / / |/| | | | |
| * | | | | Move TimeOverride to the general reusable-test-helper place.Robert Collins2012-12-182-11/+10
| | |/ / / | |/| | |
* | | | | Merge "Added conf support for security groups"Jenkins2012-12-181-1/+6
|\ \ \ \ \
| * | | | | Added conf support for security groupsJustin Hammond2012-12-171-1/+6
| |/ / / /
* | | | | Merge "Use service fixture in DB servicegroup tests."Jenkins2012-12-181-15/+26
|\ \ \ \ \
| * | | | | Use service fixture in DB servicegroup tests.Clark Boylan2012-12-171-15/+26
* | | | | | Merge "Reset the IPv6 API backend when resetting the conf stack."Jenkins2012-12-181-0/+2
|\| | | | |
| * | | | | Reset the IPv6 API backend when resetting the conf stack.Robert Collins2012-12-181-0/+2
* | | | | | Merge "Add DBDuplicateEntry exception for unique constraint violations"Jenkins2012-12-183-25/+91
|\ \ \ \ \ \
| * | | | | | Add DBDuplicateEntry exception for unique constraint violationsBoris Pavlovic2012-12-183-25/+91
| |/ / / / /
* | | | | | Merge "Add the missing replacement text in devref doc."Jenkins2012-12-182-0/+2
|\ \ \ \ \ \
| * | | | | | Add the missing replacement text in devref doc.Xiangyang Chu2012-12-142-0/+2
* | | | | | | Merge "Remove the deprecated quantum v1 code and directory."Jenkins2012-12-181-273/+0
|\ \ \ \ \ \ \
| * | | | | | | Remove the deprecated quantum v1 code and directory.Yaguang Tang2012-12-121-273/+0
* | | | | | | | Merge "fix test_nbd using stubs"Jenkins2012-12-181-12/+9
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | fix test_nbd using stubsSean Dague2012-12-171-12/+9
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge "Allows an instance to post encrypted password"Jenkins2012-12-184-4/+144
|\ \ \ \ \ \ \
| * | | | | | | Allows an instance to post encrypted passwordVishvananda Ishaya2012-12-104-4/+144
* | | | | | | | Merge "Add more association support to network API"Jenkins2012-12-1832-34/+310
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Add more association support to network APIChris Yeoh2012-12-1732-34/+310
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge "Add accounting for orphans to resource tracker."Jenkins2012-12-177-22/+164
|\ \ \ \ \ \ \