summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fix racey snapshots.Rick Harris2012-03-084-14/+56
* Merge "Remove the <acpi/> feature from UML/LXC guests"Jenkins2012-03-071-0/+2
|\
| * Remove the <acpi/> feature from UML/LXC guestsDaniel P. Berrange2012-03-071-0/+2
* | Merge "setup.py: Fix doc building"Jenkins2012-03-071-1/+1
|\ \
| * | setup.py: Fix doc buildingAdam Gandelman2012-03-071-1/+1
* | | Merge "Minor clarifications for the help strings in nova config options"Jenkins2012-03-072-59/+71
|\ \ \
| * | | Minor clarifications for the help strings in nova config optionsMatt Stephenson2012-03-062-59/+71
* | | | Merge "Add adjustable offset to audit_period."Jenkins2012-03-072-17/+230
|\ \ \ \ | |_|_|/ |/| | |
| * | | Add adjustable offset to audit_period.Monsyne Dragon2012-03-072-17/+230
* | | | Merge "Fix multi_host column name in setup_networks..."Jenkins2012-03-071-2/+2
|\ \ \ \ | |_|_|/ |/| | |
| * | | Fix multi_host column name in setup_networks...Dan Prince2012-03-071-2/+2
| |/ /
* | | Merge "nova-manage: allow use of /32 IP range"Jenkins2012-03-071-2/+16
|\ \ \
| * | | nova-manage: allow use of /32 IP rangeJulien Danjou2012-03-071-2/+16
| |/ /
* | | Merge "api-paste.ini: Add /1.0 to default urlmap"Jenkins2012-03-071-0/+1
|\ \ \
| * | | api-paste.ini: Add /1.0 to default urlmapAdam Gandelman2012-03-061-0/+1
* | | | Merge "Make test_compute console tests more robust"Jenkins2012-03-071-37/+59
|\ \ \ \
| * | | | Make test_compute console tests more robustChris Behrens2012-03-071-37/+59
* | | | | Merge "test_compute stubs same thing multiple times"Jenkins2012-03-071-81/+5
|\| | | |
| * | | | test_compute stubs same thing multiple timesChris Behrens2012-03-071-81/+5
| | |_|/ | |/| |
* | | | Merge "Clear created attributes when tearing down tests"Jenkins2012-03-074-16/+32
|\ \ \ \
| * | | | Clear created attributes when tearing down testsJohannes Erdfelt2012-03-074-16/+32
| | |_|/ | |/| |
* | | | Merge "HACKING fixes, all but sqlalchemy."Jenkins2012-03-0767-370/+387
|\ \ \ \
| * | | | HACKING fixes, all but sqlalchemy.Yuriy Taraday2012-03-0767-370/+387
| |/ / /
* | | | Merge "bug 944145: race condition causes VM's state to be SHUTOFF"Jenkins2012-03-072-8/+52
|\ \ \ \ | |/ / / |/| | |
| * | | bug 944145: race condition causes VM's state to be SHUTOFFArmando Migliaccio2012-03-072-8/+52
* | | | Merge "Cleanup some test docstrings"Jenkins2012-03-074-10/+5
|\ \ \ \
| * | | | Cleanup some test docstringsJoe Gordon2012-03-064-10/+5
* | | | | Merge "Fix bug 948611. Fix 'nova-manage logs errors'"Jenkins2012-03-071-1/+1
|\ \ \ \ \
| * | | | | Fix bug 948611. Fix 'nova-manage logs errors'Joe Gordon2012-03-061-1/+1
* | | | | | Merge "Adds nova-manage command to convert a flagfile"Jenkins2012-03-071-0/+18
|\ \ \ \ \ \
| * | | | | | Adds nova-manage command to convert a flagfileVishvananda Ishaya2012-03-061-0/+18
| | |_|_|_|/ | |/| | | |
* | | | | | Merge "Don't use _ for variable name"Jenkins2012-03-077-8/+8
|\ \ \ \ \ \
| * | | | | | Don't use _ for variable nameJohannes Erdfelt2012-03-077-8/+8
| | |_|_|_|/ | |/| | | |
* | | | | | Merge "remove undocumented, unused mpi 'extension' to ec2 metadata"Jenkins2012-03-071-20/+1
|\ \ \ \ \ \
| * | | | | | remove undocumented, unused mpi 'extension' to ec2 metadataJesse Andrews2012-03-061-20/+1
| |/ / / / /
* / / / / / Remove trailing whitespaces in regular fileHengqing Hu2012-03-0722-693/+693
|/ / / / /
* | | | | Merge "Ignore InstanceNotFound when trying to set instance to ERROR"Jenkins2012-03-072-6/+31
|\ \ \ \ \
| * | | | | Ignore InstanceNotFound when trying to set instance to ERRORChris Behrens2012-03-072-6/+31
* | | | | | Cleans up the create_conf toolVishvananda Ishaya2012-03-064-19/+1116
|/ / / / /
* | | | | Merge "Setup and teardown networks during migration"Jenkins2012-03-078-35/+204
|\ \ \ \ \
| * | | | | Setup and teardown networks during migrationTrey Morris2012-03-068-35/+204
* | | | | | Merge "fix restructuredtext formatting in docstrings that show up in the deve...Jenkins2012-03-0731-338/+395
|\ \ \ \ \ \
| * | | | | | fix restructuredtext formatting in docstrings that show up in the developer g...Doug Hellmann2012-03-0531-339/+396
* | | | | | | Merge "Fix test_attach_volume_raise_exception"Jenkins2012-03-071-2/+2
|\ \ \ \ \ \ \
| * | | | | | | Fix test_attach_volume_raise_exceptionJohannes Erdfelt2012-03-031-2/+2
* | | | | | | | Merge "Fix nova-manage floating create docs."Jenkins2012-03-072-4/+6
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | Fix nova-manage floating create docs.Lorin Hochstein2012-02-242-4/+6
* | | | | | | | Merge "Add missing directive to tox.ini."Jenkins2012-03-071-0/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Add missing directive to tox.ini.Monty Taylor2012-02-251-0/+1
* | | | | | | | | Merge "Cleans up a bunch of unused variables in XenAPI."Jenkins2012-03-075-32/+28
|\ \ \ \ \ \ \ \ \