summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Don't delete sys_meta on instance delete2013.1.2Chris Behrens2013-06-013-13/+25
* Merge "Make sure that hypervisor nodename is set correctly in FakeDriver" int...Jenkins2013-05-311-1/+3
|\
| * Make sure that hypervisor nodename is set correctly in FakeDriverHans Lindgren2013-05-161-1/+3
* | Merge "Make nova.virt.fake.FakeDriver useable in integration testing" into st...Jenkins2013-05-312-5/+11
|\ \ | |/
| * Make nova.virt.fake.FakeDriver useable in integration testingJoe Gordon2013-05-162-5/+11
* | Merge "Disallow resize if image not available" into stable/grizzlyJenkins2013-05-312-0/+39
|\ \
| * | Disallow resize if image not availableNikola Dipanov2013-05-242-0/+39
* | | Merge "Fix for missing multipath device name" into stable/grizzlyJenkins2013-05-312-2/+69
|\ \ \
| * | | Fix for missing multipath device nameWalter A. Boring IV2013-05-162-2/+69
| | |/ | |/|
* | | Merge "set bdm['volume_id'] to None rather than delete it" into stable/grizzlyJenkins2013-05-311-1/+1
|\ \ \
| * | | set bdm['volume_id'] to None rather than delete itDongdong Zhou2013-05-221-1/+1
* | | | Merge "get_instance_security_groups() fails if no name on security group" int...Jenkins2013-05-312-11/+20
|\ \ \ \
| * | | | get_instance_security_groups() fails if no name on security groupAaron Rosen2013-05-262-11/+20
* | | | | Merge "Catch volume create exception" into stable/grizzlyJenkins2013-05-312-9/+31
|\ \ \ \ \
| * | | | | Catch volume create exceptionChris Yeoh2013-05-162-9/+31
| | |_|/ / | |/| | |
* | | | | Merge "vmwareapi: Add supported_instances to host state" into stable/grizzlyJenkins2013-05-312-0/+5
|\ \ \ \ \
| * | | | | vmwareapi: Add supported_instances to host stateJim Fehlig2013-05-052-0/+5
* | | | | | Merge "Make sure confirm_resize finishes before setting vm_state to ACTIVE" i...Jenkins2013-05-312-4/+5
|\ \ \ \ \ \
| * | | | | | Make sure confirm_resize finishes before setting vm_state to ACTIVEHans Lindgren2013-05-092-4/+5
* | | | | | | Merge "Don't raise unnecessary stack traces in EC2 API" into stable/grizzlyJenkins2013-05-311-2/+0
|\ \ \ \ \ \ \
| * | | | | | | Don't raise unnecessary stack traces in EC2 APIJoe Gordon2013-05-201-2/+0
* | | | | | | | Merge "Update hypervisor_hostname after live migration" into stable/grizzlyJenkins2013-05-312-28/+59
|\ \ \ \ \ \ \ \
| * | | | | | | | Update hypervisor_hostname after live migrationBen Nemec2013-05-062-28/+59
* | | | | | | | | Merge "Fix variable referenced before assginment in vmwareapi code." into sta...Jenkins2013-05-312-4/+56
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix variable referenced before assginment in vmwareapi code.Yaguang Tang2013-05-102-4/+56
* | | | | | | | | | Merge "The vm_state should not be modified until the task is complete." into ...Jenkins2013-05-311-7/+1
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / |/| | | | | | | | |
| * | | | | | | | | The vm_state should not be modified until the task is complete.mkislinska2013-05-221-7/+1
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Merge "Fix resize when instance has no image" into stable/grizzlyJenkins2013-05-262-1/+21
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix resize when instance has no imageNikola Dipanov2013-05-232-1/+21
| |/ / / / / / / /
* | | | | | | | | Merge "Fix building quantumapi network model with network list" into stable/g...Jenkins2013-05-261-13/+9
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | |
| * | | | | | | | Fix building quantumapi network model with network listDan Smith2013-05-021-13/+9
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge "Guard against content being None" into stable/grizzlyJenkins2013-05-231-2/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | Guard against content being NoneRick Harris2013-05-011-2/+3
* | | | | | | | | Merge "nova coverage creates lots of empty folders" into stable/grizzlyJenkins2013-05-231-2/+4
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | nova coverage creates lots of empty foldersYang Yu2013-05-031-2/+4
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge "Fix zookeeper import and tests" into stable/grizzlyJenkins2013-05-232-4/+4
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | Fix zookeeper import and testsAndrew Laski2013-05-092-4/+4
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge "Reverse path SNAT for DNAT floating-ip." into stable/grizzlyJenkins2013-05-221-0/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | Reverse path SNAT for DNAT floating-ip.Brent Eagles2013-05-201-0/+3
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge "Fixes race condition of deleting floating ip" into stable/grizzlyJenkins2013-05-212-5/+31
|\ \ \ \ \ \ \ \
| * | | | | | | | Fixes race condition of deleting floating ipWangpan2013-04-292-5/+31
* | | | | | | | | Merge "xenapi: Don't swallow missing SR exception" into stable/grizzlyJenkins2013-05-212-7/+10
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | xenapi: Don't swallow missing SR exceptionRick Harris2013-05-022-7/+10
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge "Make nova-network support requested nic ordering" into stable/grizzlyJenkins2013-05-202-27/+87
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | Make nova-network support requested nic orderingZhi Yan Liu2013-05-062-27/+87
| |/ / / / / / /
* | | | | | | | Merge "Detach volume fails when using multipath iscsi" into stable/grizzlyJenkins2013-05-162-23/+71
|\ \ \ \ \ \ \ \
| * | | | | | | | Detach volume fails when using multipath iscsiXing Yang2013-05-162-23/+71
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge "Fix quantum security group driver to accept none for from/to_port" int...Jenkins2013-05-162-10/+52
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix quantum security group driver to accept none for from/to_portAaron Rosen2013-05-152-10/+52
* | | | | | | | | Merge "Raise InstanceInvalidState for double hard reboot" into stable/grizzlyJenkins2013-05-162-2/+32
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |