summaryrefslogtreecommitdiffstats
path: root/nova
Commit message (Expand)AuthorAgeFilesLines
* Merge "fix mysql race in tests"Jenkins2013-01-221-10/+8
|\
| * fix mysql race in testsSean Dague2013-01-211-10/+8
* | Merge "Fix incorrect use of context object"Jenkins2013-01-223-3/+118
|\ \
| * | Fix incorrect use of context objectgtt1162013-01-223-3/+118
* | | Merge "fix floating ip test that wasn't running"Jenkins2013-01-221-9/+9
|\ \ \
| * | | fix floating ip test that wasn't runningSean Dague2013-01-201-9/+9
| | |/ | |/|
* | | Merge "Fix get Floating ip pools action name to match with its policy"Jenkins2013-01-224-5/+22
|\ \ \
| * | | Fix get Floating ip pools action name to match with its policyMauro S. M. Rodrigues2013-01-214-5/+22
* | | | Add trust level cache to trusted_filterYunhong, Jiang2013-01-222-39/+200
| |_|/ |/| |
* | | Merge "Directly copy a file URL from glance."Jenkins2013-01-212-1/+56
|\ \ \
| * | | Directly copy a file URL from glance.John Bresnahan2013-01-182-1/+56
* | | | Merge "Clean up db network db calls for fixed and float"Jenkins2013-01-212-17/+37
|\ \ \ \
| * | | | Clean up db network db calls for fixed and floatVishvananda Ishaya2013-01-172-17/+37
* | | | | Merge "Remove restoring soft deleted entries part 2"Jenkins2013-01-212-14/+71
|\ \ \ \ \
| * | | | | Remove restoring soft deleted entries part 2Boris Pavlovic2013-01-182-14/+71
* | | | | | Merge "libvirt: Fix typo in configdrive implementation"Jenkins2013-01-212-1/+15
|\ \ \ \ \ \
| * | | | | | libvirt: Fix typo in configdrive implementationMichael J Fork2013-01-182-1/+15
* | | | | | | Merge "Remove restoring soft deleted entries part 1"Jenkins2013-01-212-36/+69
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Remove restoring soft deleted entries part 1Boris Pavlovic2013-01-182-36/+69
* | | | | | | Merge "correcting for proper use of the word 'an'."Jenkins2013-01-214-5/+5
|\ \ \ \ \ \ \
| * | | | | | | correcting for proper use of the word 'an'.Matt Joyce2013-01-164-5/+5
* | | | | | | | Merge "PXE driver should not accept empty kernel UUID."Jenkins2013-01-212-1/+19
|\ \ \ \ \ \ \ \
| * | | | | | | | PXE driver should not accept empty kernel UUID.Devananda van der Veen2013-01-172-1/+19
* | | | | | | | | Merge "Refactor EC2 keypairs exception"Jenkins2013-01-214-17/+14
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Refactor EC2 keypairs exceptionChuck Short2013-01-184-17/+14
* | | | | | | | | | Merge "Use common rootwrap from oslo-incubator"Jenkins2013-01-214-212/+14
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Use common rootwrap from oslo-incubatorThierry Carrez2013-01-174-212/+14
* | | | | | | | | | | Merge "Correcting improper use of the word 'an'."Jenkins2013-01-216-10/+10
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Correcting improper use of the word 'an'.Matt Joyce2013-01-166-10/+10
| | |_|_|/ / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge "Implement Quantum support for addition and removal of fixed IPs"Jenkins2013-01-212-2/+101
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Implement Quantum support for addition and removal of fixed IPsGary Kotton2013-01-142-2/+101
* | | | | | | | | | | | Merge "fix service_ref undefined problem."Jenkins2013-01-211-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | fix service_ref undefined problem.Wenhao Xu2013-01-211-1/+1
* | | | | | | | | | | | | Merge "Refactor compute_utils to avoid db lookup"Jenkins2013-01-213-3/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Refactor compute_utils to avoid db lookupDan Smith2013-01-213-3/+7
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge "Refactor work with TaskLog in sqlalchemy.api"Jenkins2013-01-211-51/+36
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Refactor work with TaskLog in sqlalchemy.apiBoris Pavlovic2013-01-071-51/+36
* | | | | | | | | | | | | | Merge "pick up eventlet backdoor fix from oslo"Jenkins2013-01-211-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | pick up eventlet backdoor fix from osloSean Dague2013-01-181-1/+1
| | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge "Remove network_host config option"Jenkins2013-01-191-3/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Remove network_host config optionMark McLoughlin2013-01-171-3/+0
| | |_|_|_|/ / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge "Allow nova to use insecure cinderclient."Jenkins2013-01-192-2/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Allow nova to use insecure cinderclient.Cory Stone2013-01-162-2/+16
| | |_|_|_|/ / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge "Remove obsolete baremetal override of MAC addresses."Jenkins2013-01-194-47/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Remove obsolete baremetal override of MAC addresses.Robert Collins2013-01-184-47/+4
* | | | | | | | | | | | | | Merge "Fix wrong quota reservation when deleting resizing instance"Jenkins2013-01-192-5/+75
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Fix wrong quota reservation when deleting resizing instanceWangpan2013-01-182-5/+75
| | |_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge "Use conductor in the servicegroup db driver."Jenkins2013-01-183-6/+26
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Use conductor in the servicegroup db driver.Russell Bryant2013-01-183-6/+26
* | | | | | | | | | | | | | Merge "Add service_update to conductor."Jenkins2013-01-184-1/+26
|\| | | | | | | | | | | | |