summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* merge trunkSalvatore Orlando2011-03-2442-358/+1494
|\
| * 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-2453-750/+2292
| | |\
| | * | 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
| * | | Poll instance states periodically, so that we can detect when something chang...Justin Santa Barbara2011-03-2411-23/+442
| |\ \ \ | | |_|/ | |/| |
| | * | Merged with conflict and resolved conflict (with my own patch, no less)Justin Santa Barbara2011-03-2421-168/+322
| | |\ \ | | |/ / | |/| |
| * | | Added a mechanism for versioned controllers for openstack api versions 1.0/1.1.Naveed Massjouni2011-03-2412-139/+215
| |\ \ \
| | * | | Fixed the docstring for common.get_id_from_hrefNaveed Massjouni2011-03-241-2/+2
| | * | | Merge from trunkNaveed Massjouni2011-03-2412-81/+242
| | |\ \ \ | | |/ / / | |/| | |
| * | | | 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-2319-426/+1282
| | |\ \ \ \ \ \
| | * | | | | | | Automatically unrescue instances after a given timeoutJosh Kearney2011-03-235-26/+96
| | | |_|_|_|_|/ | | |/| | | | |
| * | | | | | | boto_v6 module is imported if the flag "use_ipv6" is set to TrueTushar Patil2011-03-241-1/+3
| |\ \ \ \ \ \ \
| | * | | | | | | Fix for LP Bug #739641Tushar Patil2011-03-211-1/+3
| | | | | | | * | Merge from trunkNaveed Massjouni2011-03-2421-112/+562
| | | | | | | |\ \
| | | | | | | * | | Should not call super __init__ twice in APIRouterNaveed Massjouni2011-03-231-2/+0
| | | | | | | * | | Merge from trunk.Naveed Massjouni2011-03-2322-496/+1373
| | | | | | | |\ \ \ | | | | | |_|_|/ / / | | | | |/| | | | |
| | | | | | | * | | 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-2162-536/+1836
| | | | | | | |\ \ \
| | | | | | | * | | | 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-1722-117/+1003
| | | | | | | |\ \ \ \ \
| | | | | | | * | | | | | 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-1712-121/+191
| | | | | | | | | | | | | * 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-2327-162/+697
| | | | | | | | | | | | | |\ | | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | Move all types of locking into utils.synchronize decorator.Soren Hansen2011-03-245-52/+135
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | Merge trunkSoren Hansen2011-03-2438-531/+1838
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | Updates the previously merged xs_migration functionality to allow upsizing of...matt.dietz@rackspace.com2011-03-2314-63/+273
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | 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