summaryrefslogtreecommitdiffstats
path: root/nova/compute
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | | | | | | | | | | | | | Merge from trunk and mega conflict resolutionCerberus2011-02-282-1/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ / / / / / / | | | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Merge from trunk and merge conflict resolutionCerberus2011-02-282-21/+63
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ / / / / / / | | | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Merge from trunk and merge conflict resolutionCerberus2011-02-182-27/+49
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | Pep8 cleanupCerberus2011-02-182-51/+46
| | * | | | | | | | | | | | | | | | Merge from trunkCerberus2011-02-172-0/+19
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | Stop blowing away the ramdiskCerberus2011-02-171-1/+1
| | * | | | | | | | | | | | | | | | | FooCerberus2011-02-171-1/+2
| | * | | | | | | | | | | | | | | | | fixedCerberus2011-02-162-3/+4
| | * | | | | | | | | | | | | | | | | TyposCerberus2011-02-162-5/+5
| | * | | | | | | | | | | | | | | | | Merge from trunkCerberus2011-02-163-8/+10
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | DerpCerberus2011-02-162-12/+46
| | * | | | | | | | | | | | | | | | | I fail at sessionsCerberus2011-02-161-1/+1
| | * | | | | | | | | | | | | | | | | I fail at sessionsCerberus2011-02-161-1/+0
| | * | | | | | | | | | | | | | | | | FooCerberus2011-02-152-18/+18
| | * | | | | | | | | | | | | | | | | failCerberus2011-02-151-2/+6
| | * | | | | | | | | | | | | | | | | derpCerberus2011-02-151-1/+1
| | * | | | | | | | | | | | | | | | | Better host acquisitionCerberus2011-02-151-3/+4
| | * | | | | | | | | | | | | | | | | Tons o logginCerberus2011-02-141-0/+1
| | * | | | | | | | | | | | | | | | | RefactoredCerberus2011-02-141-4/+5
| | * | | | | | | | | | | | | | | | | Typo fixesCerberus2011-02-141-1/+1
| | * | | | | | | | | | | | | | | | | Some refactoringCerberus2011-02-141-2/+2
| | * | | | | | | | | | | | | | | | | More fixesCerberus2011-02-141-1/+2
| | * | | | | | | | | | | | | | | | | More typosCerberus2011-02-111-3/+3
| | * | | | | | | | | | | | | | | | | More typosCerberus2011-02-111-2/+10
| | * | | | | | | | | | | | | | | | | Cast to hostCerberus2011-02-111-2/+2
| | * | | | | | | | | | | | | | | | | Merge from trunkCerberus2011-02-111-2/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|/ / / / / / / | | | |/| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | Typo fixes and some stupidity about the modelsCerberus2011-02-101-1/+1
| | * | | | | | | | | | | | | | | | | Spawn from diskCerberus2011-02-101-1/+1
| | * | | | | | | | | | | | | | | | | Some more cleanupCerberus2011-02-101-3/+4
| | * | | | | | | | | | | | | | | | | A lot of stuffCerberus2011-02-091-4/+4
| | * | | | | | | | | | | | | | | | | Changes and bug fixesCerberus2011-02-081-4/+4
| | * | | | | | | | | | | | | | | | | blarghCerberus2011-02-071-1/+1
| | * | | | | | | | | | | | | | | | | A few changesCerberus2011-02-071-4/+20
| | * | | | | | | | | | | | | | | | | Added a bunch of stubbed out functionalityCerberus2011-02-042-16/+71
| | * | | | | | | | | | | | | | | | | Casting to the schedulerCerberus2011-02-021-3/+7
| | * | | | | | | | | | | | | | | | | Merge from trunkCerberus2011-01-283-35/+44
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|/ / / / / / / | | | |/| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | Merge from trunkmatt.dietz@rackspace.com2011-01-211-2/+5
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge from trunkCerberus2011-01-192-10/+38
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | | | |/| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | Basic stubbing throughout the stackCerberus2011-01-182-0/+27
| * | | | | | | | | | | | | | | | | | | merge lp:novaMark Washenberger2011-03-041-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|/ / / / / / / | | |/| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | Use %s in case instance_id came through as a stringRick Harris2011-03-031-2/+2
| | | |_|_|_|_|_|_|_|_|_|/ / / / / / / | | |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | remove ensure_b64_encodingMark Washenberger2011-03-041-8/+2
| * | | | | | | | | | | | | | | | | | merge lp:novaMark Washenberger2011-03-033-29/+134
| |\| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | merged trunkKen Pepple2011-03-021-10/+24
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | Review feedbackJosh Kearney2011-03-011-18/+24
| | | * | | | | | | | | | | | | | | | | Merged trunkJosh Kearney2011-03-012-1/+2
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|_|_|/ / / / / / / | | | | |/| | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | Merged trunkJosh Kearney2011-02-252-0/+19
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|_|_|/ / / / / / / | | | | |/| | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | Merged trunkJosh Kearney2011-02-241-1/+26
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merged trunkJosh Kearney2011-02-231-1/+1
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merged trunkJosh Kearney2011-02-214-54/+95
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / | | | | |/| | | | | | | | | | | | | | | | |