summaryrefslogtreecommitdiffstats
path: root/nova
Commit message (Expand)AuthorAgeFilesLines
* merge trunkSalvatore Orlando2011-03-2439-350/+1477
|\
| * Pass a fake timing source to live_migration_pre in every test that expectes i...Soren Hansen2011-03-244-8/+36
| |\
| | * Merge trunkSoren Hansen2011-03-2448-741/+2118
| | |\
| | * | Apparantly a more common problem than first thought.Soren Hansen2011-03-222-5/+17
| | * | Pass a fake timing source to test_ensure_filtering_rules_for_instance_timeout...Soren Hansen2011-03-222-4/+21
| * | | Merged with conflict and resolved conflict (with my own patch, no less)Justin Santa Barbara2011-03-2419-161/+307
| |\ \ \ | | | |/ | | |/|
| | * | Fixed the docstring for common.get_id_from_hrefNaveed Massjouni2011-03-241-2/+2
| | * | Merge from trunkNaveed Massjouni2011-03-2411-80/+239
| | |\ \
| | | * \ better logging of exceptionsJustin Santa Barbara2011-03-241-2/+2
| | | |\ \
| | | | * | Report the exception (happens when can't import libvirt)Justin Santa Barbara2011-03-231-2/+2
| | | * | | Fix issues with certificate updating & whitespace removalTodd Willey2011-03-242-2/+3
| | | |\ \ \
| | | | * | | Fix some crypto strangeness (\n in file_name field of certificates, wrong IMP...Todd Willey2011-03-232-2/+3
| | | * | | | Offers the ability to run a periodic_task that sweeps through rescued instanc...Josh Kearney2011-03-246-24/+99
| | | |\ \ \ \
| | | | * | | | Added hyperv stubJosh Kearney2011-03-231-0/+3
| | | | * | | | Review feedbackJosh Kearney2011-03-232-16/+16
| | | | * | | | Better method nameJosh Kearney2011-03-232-4/+4
| | | | * | | | Added docstringJosh Kearney2011-03-231-0/+1
| | | | * | | | Only run periodic task when rescue_timeout is greater than 0Josh Kearney2011-03-231-1/+2
| | | | * | | | Fixed some typosJosh Kearney2011-03-231-4/+4
| | | | * | | | Merged trunkJosh Kearney2011-03-2317-425/+1125
| | | | |\ \ \ \
| | | | * | | | | Automatically unrescue instances after a given timeoutJosh Kearney2011-03-235-26/+96
| | | | | |_|_|/ | | | | |/| | |
| | * | | | | | Merge from trunkNaveed Massjouni2011-03-2420-111/+560
| | |\ \ \ \ \ \
| | * | | | | | | Should not call super __init__ twice in APIRouterNaveed Massjouni2011-03-231-2/+0
| | * | | | | | | Merge from trunk.Naveed Massjouni2011-03-2320-495/+1216
| | |\ \ \ \ \ \ \ | | | | |_|_|/ / / | | | |/| | | | |
| | * | | | | | | Using super to call parent _setup_routes in APIRouter subclasses.Naveed Massjouni2011-03-231-2/+2
| | * | | | | | | Updating doc strings in accordance with PEP 257. Fixing order of imports inNaveed Massjouni2011-03-223-17/+25
| | * | | | | | | Now using urlparse to parse a url to grab id out of it.Naveed Massjouni2011-03-221-3/+4
| | * | | | | | | Adding more docstrings. image_id and instance_type fields of an instance willNaveed Massjouni2011-03-222-13/+16
| | * | | | | | | merging trunkBrian Waldon2011-03-2141-429/+1335
| | |\ \ \ \ \ \ \
| | * | | | | | | | pep8; various fixesBrian Waldon2011-03-213-7/+16
| | * | | | | | | | Merge from trunk.Naveed Massjouni2011-03-178-21/+149
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | Now returns a 400 for a create server request with invalid hrefs forNaveed Massjouni2011-03-173-44/+37
| | * | | | | | | | | Merge from parent branch lp:~rackspace-titan/nova/openstack-api-version-splitNaveed Massjouni2011-03-1720-109/+945
| | |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Setting the api verion in the request in the auth middle is no longer needed.Naveed Massjouni2011-03-172-6/+0
| | * | | | | | | | | | moving code out of try/except that would never trigger NotFoundNaveed Massjouni2011-03-171-2/+3
| | |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Added mechanism for versioned controllers for openstack api versions 1.0/1.1.Naveed Massjouni2011-03-1711-115/+179
| * | | | | | | | | | | | pep8 fixJustin Santa Barbara2011-03-231-1/+1
| * | | | | | | | | | | | Added revert_resize to base classJustin Santa Barbara2011-03-231-0/+4
| * | | | | | | | | | | | Merged with lp:nova, fixed conflictsJustin Santa Barbara2011-03-2326-161/+695
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | |
| | * | | | | | | | | | | Merge trunkSoren Hansen2011-03-2435-529/+1679
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ / / / | | | |/| | | | | | | | |
| | | * | | | | | | | | | Updates the previously merged xs_migration functionality to allow upsizing of...matt.dietz@rackspace.com2011-03-2313-62/+271
| | | |\ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | merge prop fixesmatt.dietz@rackspace.com2011-03-232-4/+20
| | | | * | | | | | | | | | Forgot extraneous module import againmatt.dietz@rackspace.com2011-03-231-1/+0
| | | | * | | | | | | | | | Forgot extraneous module importmatt.dietz@rackspace.com2011-03-231-1/+0
| | | | * | | | | | | | | | Unit test cleanupmatt.dietz@rackspace.com2011-03-233-4/+5
| | | | * | | | | | | | | | Moving the migration yet againmatt.dietz@rackspace.com2011-03-231-0/+0
| | | | * | | | | | | | | | Merge from trunkmatt.dietz@rackspace.com2011-03-2317-425/+1125
| | | | |\ \ \ \ \ \ \ \ \ \ | | | | | | |_|_|_|_|/ / / / | | | | | |/| | | | | | | |
| | | | * | | | | | | | | | merge prop changesmatt.dietz@rackspace.com2011-03-233-11/+19
| | | | * | | | | | | | | | Tweakmatt.dietz@rackspace.com2011-03-223-0/+6
| | | | * | | | | | | | | | tweakmatt.dietz@rackspace.com2011-03-221-2/+4