summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "script for configuring a vif in Xen in non-bridged mode"Jenkins2013-01-151-0/+39
|\
| * script for configuring a vif in Xen in non-bridged modeChristian Berendt2012-11-121-0/+39
* | Merge "Cells: Add cells API extension"Jenkins2013-01-1537-36/+1127
|\ \
| * | Cells: Add cells API extensionChris Behrens2013-01-1537-36/+1127
* | | Merge "Remove unused import."Jenkins2013-01-152-2/+0
|\ \ \
| * | | Remove unused import.Russell Bryant2013-01-152-2/+0
* | | | Merge "Cells: Add some cells support to admin_actions extension"Jenkins2013-01-154-11/+140
|\ \ \ \
| * | | | Cells: Add some cells support to admin_actions extensionMatthew Sherborne2013-01-154-11/+140
* | | | | Merge "Expand quota logging"Jenkins2013-01-151-0/+2
|\ \ \ \ \
| * | | | | Expand quota loggingJoe Gordon2013-01-101-0/+2
* | | | | | Merge "Implements getPasswordData for ec2"Jenkins2013-01-152-0/+30
|\ \ \ \ \ \
| * | | | | | Implements getPasswordData for ec2Vishvananda Ishaya2013-01-112-0/+30
* | | | | | | Merge "Make resource tracker use conductor for migration updates"Jenkins2013-01-151-2/+1
|\ \ \ \ \ \ \
| * | | | | | | Make resource tracker use conductor for migration updatesDan Smith2013-01-151-2/+1
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge "Correct docstring on sizelimit middleware."Jenkins2013-01-151-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Correct docstring on sizelimit middleware.Dan Prince2013-01-141-1/+1
* | | | | | | | Merge "Adds a flag to allow configuring a region"Jenkins2013-01-151-1/+13
|\ \ \ \ \ \ \ \
| * | | | | | | | Adds a flag to allow configuring a regionRohit Karajgi2013-01-091-1/+13
* | | | | | | | | Merge "Fix problem with ipv6 link-local address(es)"Jenkins2013-01-151-3/+11
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix problem with ipv6 link-local address(es)Davanum Srinivas2013-01-141-3/+11
* | | | | | | | | | Merge "Add 'devname' to nova.network.model.VIF class"Jenkins2013-01-156-29/+37
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add 'devname' to nova.network.model.VIF classDaniel P. Berrange2013-01-156-29/+37
* | | | | | | | | | | Merge "Cleaning up exception handling"Jenkins2013-01-151-10/+14
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Cleaning up exception handlingJustin Shepherd2013-01-151-10/+14
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge "minor improvements to nova/tests/test_metadata.py"Jenkins2013-01-151-1/+9
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / |/| | | | | | | | | |
| * | | | | | | | | | minor improvements to nova/tests/test_metadata.pyScott Moser2013-01-151-1/+9
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge "Cells: Commit resize quota reservations immediately"Jenkins2013-01-152-13/+50
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Cells: Commit resize quota reservations immediatelyChris Behrens2013-01-132-13/+50
* | | | | | | | | | | Merge "More HostAPI() cleanup for cells."Jenkins2013-01-156-280/+224
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | |
| * | | | | | | | | | More HostAPI() cleanup for cells.Chris Behrens2013-01-156-280/+224
* | | | | | | | | | | Merge "Populate service list with availability zone and correct unit test"Jenkins2013-01-152-7/+9
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Populate service list with availability zone and correct unit testMichael J Fork2013-01-152-7/+9
| | |_|_|_|/ / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge "Move network call from compute API to the manager"Jenkins2013-01-155-24/+11
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Move network call from compute API to the managerChris Behrens2013-01-125-24/+11
* | | | | | | | | | | | Merge "Make sure reboot_instance uses updated instance"Jenkins2013-01-152-13/+17
|\| | | | | | | | | | |
| * | | | | | | | | | | Make sure reboot_instance uses updated instanceChris Behrens2013-01-122-13/+17
* | | | | | | | | | | | Merge "Renames the new os-networks extension"Jenkins2013-01-1517-358/+359
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Renames the new os-networks extensionMatt Dietz2013-01-1517-358/+359
* | | | | | | | | | | | Correct misspelling of fake_service_get_allMichael J Fork2013-01-151-2/+2
| |_|/ / / / / / / / / |/| | | | | | | | | |
* | | | | | | | | | | Merge "Export the MAC addresses of nodes for bare-metal."Jenkins2013-01-152-0/+19
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Export the MAC addresses of nodes for bare-metal.Robert Collins2013-01-152-0/+19
* | | | | | | | | | | | Merge "Break out a helper function for working with bare metal nodes."Jenkins2013-01-151-3/+12
|\| | | | | | | | | | |
| * | | | | | | | | | | Break out a helper function for working with bare metal nodes.Robert Collins2013-01-151-3/+12
* | | | | | | | | | | | Merge "Define a hypervisor driver method for getting MAC addresses."Jenkins2013-01-157-7/+103
|\| | | | | | | | | | | | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Define a hypervisor driver method for getting MAC addresses.Robert Collins2013-01-157-7/+103
* | | | | | | | | | | Merge "Cleanup reboot_instance tests"Jenkins2013-01-151-85/+98
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Cleanup reboot_instance testsChris Behrens2013-01-121-85/+98
| | |_|_|_|_|_|/ / / | |/| | | | | | | |
* | | | | | | | | | Merge "Cells: Reduce the create_image call depth for cells"Jenkins2013-01-154-20/+152
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Cells: Reduce the create_image call depth for cellsiccha.sethi2013-01-134-20/+152
* | | | | | | | | | | Merge "Clean up compute API image_create"Jenkins2013-01-155-99/+27
|\| | | | | | | | | |