summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | Merge "Add MultipleCreate template and fix conflict with other templates"Jenkins2013-03-094-15/+13
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Add MultipleCreate template and fix conflict with other templatesMauro S. M. Rodrigues2013-03-074-15/+13
* | | | | | | | | | | | Merge "add .idea folder to .gitignore pycharm creates this folder"Jenkins2013-03-091-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | add .idea folder to .gitignore pycharm creates this folderkashivreddy2013-03-071-0/+1
| | |_|/ / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge "Fix Wrong syntax for set:tag in dnsmasq startup option"Jenkins2013-03-092-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Fix Wrong syntax for set:tag in dnsmasq startup optionDavanum Srinivas2013-03-082-2/+2
| | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge "Fix instance evacuate with shared storage"Jenkins2013-03-092-0/+27
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Fix instance evacuate with shared storageKravchenko Pavel2013-03-082-0/+27
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge "Nova network needs to take care of existing alias"Jenkins2013-03-091-1/+4
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Nova network needs to take care of existing aliasÉdouard Thuleau2013-02-151-1/+4
* | | | | | | | | | | | | Merge "Correct substring matching of baremetal VPD node names"Jenkins2013-03-093-15/+30
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Correct substring matching of baremetal VPD node namesChris Krelle2013-03-083-15/+30
| | |/ / / / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Prevent rescue for volume-backed instancesNikola Dipanov2013-03-095-12/+70
| |_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | |
* | | | | | | | | | | | Merge "Fix ephemeral devices on LVM don't get mkfs'd"Jenkins2013-03-094-3/+11
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Fix ephemeral devices on LVM don't get mkfs'dRafi Khardalian2013-03-014-3/+11
* | | | | | | | | | | | | Merge "Fix Network object encoding issue when using qpid"Jenkins2013-03-091-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Fix Network object encoding issue when using qpidzhhuabj2013-03-051-1/+1
* | | | | | | | | | | | | | Merge "Make 'os-hosts/node1' case sensitivity defer to DB"Jenkins2013-03-092-8/+24
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Make 'os-hosts/node1' case sensitivity defer to DBJoe Gordon2013-03-072-8/+24
| | |_|_|_|/ / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge "Fix for delete error in Hyper-V - missing CONF imports"Jenkins2013-03-081-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Fix for delete error in Hyper-V - missing CONF importsDavanum Srinivas2013-03-071-0/+2
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge "Remove uses of instance['instance_type'] from nova/scheduler"Jenkins2013-03-083-13/+27
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Remove uses of instance['instance_type'] from nova/schedulerDan Smith2013-03-083-13/+27
* | | | | | | | | | | | | | Merge "Remove uses of instance['instance_type'] from nova/api"Jenkins2013-03-087-23/+62
|\| | | | | | | | | | | | |
| * | | | | | | | | | | | | Remove uses of instance['instance_type'] from nova/apiDan Smith2013-03-087-23/+62
* | | | | | | | | | | | | | Merge "Remove uses of instance['instance_type'] from nova/network"Jenkins2013-03-085-17/+43
|\| | | | | | | | | | | | |
| * | | | | | | | | | | | | Remove uses of instance['instance_type'] from nova/networkDan Smith2013-03-085-17/+43
* | | | | | | | | | | | | | Merge "Remove uses of instance['instance_type'] from nova/compute"Jenkins2013-03-085-57/+29
|\| | | | | | | | | | | | |
| * | | | | | | | | | | | | Remove uses of instance['instance_type'] from nova/computeDan Smith2013-03-085-57/+29
* | | | | | | | | | | | | | Merge "Remove uses of instance['instance_type'] from libvirt driver."Jenkins2013-03-084-9/+26
|\| | | | | | | | | | | | |
| * | | | | | | | | | | | | Remove uses of instance['instance_type'] from libvirt driver.Dan Smith2013-03-064-9/+26
* | | | | | | | | | | | | | Merge "Remove uses of instance['instance_type'] from powervm driver."Jenkins2013-03-083-5/+13
|\| | | | | | | | | | | | | | |_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Remove uses of instance['instance_type'] from powervm driver.Dan Smith2013-03-063-5/+13
* | | | | | | | | | | | | Merge "Fix instance type cleanup when doing a same-id migration"Jenkins2013-03-082-7/+76
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Fix instance type cleanup when doing a same-id migrationDan Smith2013-03-072-7/+76
* | | | | | | | | | | | | | Merge "Add conductor to nova-all."Jenkins2013-03-081-2/+20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Add conductor to nova-all.Rick Harris2013-03-081-2/+20
* | | | | | | | | | | | | | | Merge "Rework instance actions to work with cells"Jenkins2013-03-0813-5/+297
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Rework instance actions to work with cellsAndrew Laski2013-02-2513-5/+297
* | | | | | | | | | | | | | | | Merge "Make nova-manage db archive_deleted_rows more explicit"Jenkins2013-03-083-6/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Make nova-manage db archive_deleted_rows more explicitJoe Gordon2013-03-083-6/+15
* | | | | | | | | | | | | | | | Merge "Fixed image filter support for vmware"Jenkins2013-03-081-1/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Fixed image filter support for vmwaredivakar-padiyar-nandavar2013-03-061-1/+3
* | | | | | | | | | | | | | | | Fix access_ip_* raceChris Behrens2013-03-072-40/+55
| |_|_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge "Add missing action_start if deleting resized inst."Jenkins2013-03-071-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Add missing action_start if deleting resized inst.Dan Prince2013-03-051-0/+4
| | |_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge "Read baremetal images from extra_specs namespace."Jenkins2013-03-072-16/+18
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Read baremetal images from extra_specs namespace.Devananda van der Veen2013-03-042-16/+18
* | | | | | | | | | | | | | | Merge "Update tox.ini to support RHEL 6.x."Jenkins2013-03-073-2/+45
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Update tox.ini to support RHEL 6.x.Dan Prince2013-03-073-2/+45
| | |_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | |