summaryrefslogtreecommitdiffstats
path: root/nova/compute
Commit message (Expand)AuthorAgeFilesLines
...
* Merge "Add minDisk and minRam to OSAPI image details"Jenkins2011-09-231-0/+5
|\
| * Add minDisk and minRam to OSAPI image detailsAlex Meade2011-09-231-0/+5
* | Fix outstanding pep8 errors for a clean trunk.Monty Taylor2011-09-231-2/+2
|/
* Merging trunkRick Harris2011-09-212-9/+15
|\
| * Renumbering instance progress migrationRick Harris2011-09-211-4/+2
| |\
| * \ Fixing testsRick Harris2011-09-214-10/+172
| |\ \
| * \ \ Merging trunkRick Harris2011-09-192-23/+24
| |\ \ \
| * \ \ \ Merging trunkRick Harris2011-09-162-7/+16
| |\ \ \ \
| * | | | | Adding migration progressRick Harris2011-09-161-1/+1
| * | | | | Fixing tests, PEP8 failuresRick Harris2011-09-161-1/+2
| * | | | | Allowing resizes to the same machineRick Harris2011-09-161-5/+7
| * | | | | Adding progressRick Harris2011-09-141-3/+6
* | | | | | Merging trunkRick Harris2011-09-211-4/+2
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | trunk merge fixupSandy Walsh2011-09-214-7/+145
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| * | | | | clean up based on cerberus reviewSandy Walsh2011-09-212-32/+66
| |\ \ \ \ \
| * \ \ \ \ \ trunk mergeSandy Walsh2011-09-131-1/+1
| |\ \ \ \ \ \
| * \ \ \ \ \ \ we're backSandy Walsh2011-09-132-2/+4
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | |
| * | | | | | | bug fixesSandy Walsh2011-09-122-8/+7
| |\ \ \ \ \ \ \
* | \ \ \ \ \ \ \ Merging trunkRick Harris2011-09-214-7/+145
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | |
| * | | | | | | | Instance deletions in Openstack are immediate. This can cause data to be lost...Johannes Erdfelt2011-09-214-7/+145
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | |
| | * | | | | | | In the unlikely case of an instance losing a host, make sure we stillJohannes Erdfelt2011-09-141-0/+3
| | * | | | | | | Cleanup state management to use vm_state instead of task_stateJohannes Erdfelt2011-09-144-22/+46
| | * | | | | | | Merge with trunkJohannes Erdfelt2011-09-141-1/+1
| | |\ \ \ \ \ \ \ | | | | |_|_|/ / / | | | |/| | | | |
| | * | | | | | | Merge with trunkJohannes Erdfelt2011-09-122-6/+9
| | |\ \ \ \ \ \ \ | | | | |_|_|/ / / | | | |/| | | | |
| | * | | | | | | Use triple quotes for docstrings to be consistentJohannes Erdfelt2011-09-091-1/+1
| | * | | | | | | Cleanup some more commentsJohannes Erdfelt2011-09-081-2/+0
| | * | | | | | | Check task_state for queued deleteJohannes Erdfelt2011-09-071-6/+7
| | * | | | | | | Make sure instance is deleted before allowing restore or forceDeleteJohannes Erdfelt2011-09-071-0/+18
| | * | | | | | | delete_instance_interval -> reclaim_instance_intervalJohannes Erdfelt2011-09-072-4/+5
| | * | | | | | | Merge with trunkJohannes Erdfelt2011-09-071-0/+1
| | |\ \ \ \ \ \ \ | | | | |_|/ / / / | | | |/| | | | |
| | * | | | | | | Default to 0 seconds (off)Johannes Erdfelt2011-09-061-1/+1
| | * | | | | | | PEP8 cleanupsJohannes Erdfelt2011-09-061-4/+4
| | * | | | | | | Merge with trunkJohannes Erdfelt2011-09-061-4/+4
| | |\ \ \ \ \ \ \
| | * | | | | | | | Implement deferred delete of instancesJohannes Erdfelt2011-09-063-9/+102
* | | | | | | | | | Merging trunkRick Harris2011-09-212-3/+27
|\| | | | | | | | |
| * | | | | | | | | merged trunk and resolved conflictChris Behrens2011-09-191-2/+14
| |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ PEP8 cleanup.Josh Kearney2011-09-191-1/+12
| | |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merged trunk.Josh Kearney2011-09-192-29/+39
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|/ | | | |/| | | | | | | |
| | * | | | | | | | | | Initial pass at automatically confirming resizes after a given window.Josh Kearney2011-09-141-2/+14
| | | |_|_|_|_|_|/ / / | | |/| | | | | | | |
| * | | | | | | | | | Removed the extra code added to support filtering instances by instance uuids.Chris Behrens2011-09-191-2/+3
| | |_|/ / / / / / / | |/| | | | | | | |
| * | | | | | | | | merge the sknurtJason Koelker2011-09-192-29/+39
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |
| * | | | | | | | | Fix typo in commentJason Koelker2011-09-191-1/+1
| * | | | | | | | | update commentJason Koelker2011-09-151-1/+1
| * | | | | | | | | make sure to use the uuidJason Koelker2011-09-151-3/+3
| * | | | | | | | | fix up the filtering so it does not return duplicates if both the network and...Jason Koelker2011-09-141-7/+2
| * | | | | | | | | make sure to pass in the contextJason Koelker2011-09-141-1/+1
| * | | | | | | | | move ip filtering over to the network sideJason Koelker2011-09-141-2/+5
| * | | | | | | | | make sure we are grabbing out just the idsJason Koelker2011-09-141-3/+6
| * | | | | | | | | merge the trunkJason Koelker2011-09-141-1/+1
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |
| * | | | | | | | | run the instances filter through the network api first, then through the dbJason Koelker2011-09-141-1/+11
| | |_|_|_|_|/ / / | |/| | | | | | |