summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | | | | | | | | | | | 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-216-221/+21
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Use common rootwrap from oslo-incubatorThierry Carrez2013-01-176-221/+21
* | | | | | | | | | | | | | | | | | | | | | | Merge "Correcting improper use of the word 'an'."Jenkins2013-01-217-12/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | Correcting improper use of the word 'an'.Matt Joyce2013-01-167-12/+12
| | |_|_|/ / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | 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 "Remove baremetal-compute-pxe.filters"Jenkins2013-01-211-11/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | Remove baremetal-compute-pxe.filtersMark McLoughlin2013-01-091-11/+0
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | 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
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | Avoid testtools 0.9.25Johannes Erdfelt2013-01-211-1/+2
| |_|/ / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | Merge "Remove network_host config option"Jenkins2013-01-191-3/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | Remove network_host config optionMark McLoughlin2013-01-171-3/+0
| | |_|_|_|_|/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | Merge "Fix multi line docstring tests in hacking.py"Jenkins2013-01-193-31/+50
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | Fix multi line docstring tests in hacking.pyJoe Gordon2013-01-173-31/+50
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | Merge "Allow nova to use insecure cinderclient."Jenkins2013-01-193-3/+21
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | Allow nova to use insecure cinderclient.Cory Stone2013-01-163-3/+21
| | |_|_|_|_|_|/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | 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
|\| | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | Add service_update to conductor.Russell Bryant2013-01-184-1/+26
* | | | | | | | | | | | | | | | | | | | | | | | Merge "Remove some db calls from db servicegroup driver."Jenkins2013-01-183-14/+8
|\| | | | | | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Remove some db calls from db servicegroup driver.Russell Bryant2013-01-183-14/+8
| |/ / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | Merge "Save password set through xen agent."Jenkins2013-01-181-0/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Save password set through xen agent.Vishvananda Ishaya2013-01-161-0/+9
* | | | | | | | | | | | | | | | | | | | | | Merge "Cells: Fix for relaying instance info_cache updates"Jenkins2013-01-181-6/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | Cells: Fix for relaying instance info_cache updatesChris Behrens2013-01-181-6/+7
| | |/ / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | Merge "Makes sure compute doesn't crash on failed resume."Jenkins2013-01-182-0/+34
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | Makes sure compute doesn't crash on failed resume.Vishvananda Ishaya2013-01-162-0/+34
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | Merge "don't allow crs in the code"Jenkins2013-01-182-0/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | don't allow crs in the codeSean Dague2013-01-162-0/+14
| | |_|_|/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | Merge "Add host to instance_faults table."Jenkins2013-01-1810-55/+95
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | Add host to instance_faults table.Rick Harris2013-01-1710-55/+95
| | |_|_|_|_|_|_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | Merge "Create ports in quantum matching hypervisor MAC addresses."Jenkins2013-01-173-6/+90
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Create ports in quantum matching hypervisor MAC addresses.Robert Collins2013-01-163-6/+90
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge "Reduce number of iptable-save restore loops"Jenkins2013-01-175-63/+70
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Reduce number of iptable-save restore loopsJoe Gordon2013-01-155-63/+70
* | | | | | | | | | | | | | | | | | | | Merge "Clean up get_instance_id_by_floating_address"Jenkins2013-01-173-14/+23
|\| | | | | | | | | | | | | | | | | | |