summaryrefslogtreecommitdiffstats
path: root/nova
Commit message (Expand)AuthorAgeFilesLines
* Merge "Refactors periodic tasks to use a decorator."Jenkins2011-12-0710-121/+169
|\
| * Refactors periodic tasks to use a decorator.Rick Harris2011-12-0710-121/+169
* | Merge "Update associate_floating_ip to use instance objs"Jenkins2011-12-075-13/+60
|\ \
| * | Update associate_floating_ip to use instance objsAlex Meade2011-12-065-13/+60
* | | Merge "First steps towards consolidating testing infrastructure"Jenkins2011-12-0712-13/+429
|\ \ \
| * | | First steps towards consolidating testing infrastructureDuncan McGreggor2011-12-0612-13/+429
* | | | Remove extra_context support in FlagsMark McLoughlin2011-12-071-22/+2
| |_|/ |/| |
* | | Merge "Change cloudServersFault to computeFault"Jenkins2011-12-072-24/+19
|\ \ \
| * | | Change cloudServersFault to computeFaultAlex Meade2011-12-062-24/+19
* | | | Merge "vm_state:=error on driver exceptions during resize"Jenkins2011-12-072-14/+47
|\ \ \ \
| * | | | vm_state:=error on driver exceptions during resizeMark Washenberger2011-12-062-14/+47
| | |_|/ | |/| |
* | | | Remove bzr related code in tests/test_miscJoe Gordon2011-12-061-20/+1
| |/ / |/| |
* | | Merge "Remove some remnants of ChangeLog and vcsversion.py generation"Jenkins2011-12-061-9/+1
|\ \ \ | |/ / |/| |
| * | Remove some remnants of ChangeLog and vcsversion.py generationMark McLoughlin2011-12-061-9/+1
* | | Update compute manager so that finish_revert_resize runs on the sourceDan Prince2011-12-061-1/+1
| |/ |/|
* | Merge "Pass '-r' option to 'collie cluster status'."Jenkins2011-12-061-1/+4
|\ \
| * | Pass '-r' option to 'collie cluster status'.François Charlier2011-12-061-1/+4
| |/
* | Merge "Add NAT/gateway support to QuantumManager"Jenkins2011-12-064-20/+70
|\ \ | |/ |/|
| * Add NAT/gateway support to QuantumManagerBrad Hall2011-11-294-20/+70
* | Merge "remove duplicate netaddr in nova/utils"Jenkins2011-12-061-1/+0
|\ \
| * | remove duplicate netaddr in nova/utilsJoe Gordon2011-12-051-1/+0
* | | Merge "Make admin_password keyword in compute manager run_instance method mat...Jenkins2011-12-061-2/+2
|\ \ \
| * | | Make admin_password keyword in compute manager run_instance method matchDan Prince2011-12-051-2/+2
| |/ /
* / / Fixes a typo preventing attaching RBD volumes.François Charlier2011-12-062-2/+2
|/ /
* | Merge "Add availabity_zone to the refresh list"Jenkins2011-12-051-2/+7
|\ \
| * | Add availabity_zone to the refresh listJoseph W. Breu2011-12-021-2/+7
* | | Merge "Implement resize down for XenAPI"Jenkins2011-12-0514-168/+300
|\ \ \
| * | | Implement resize down for XenAPIJohannes Erdfelt2011-12-0214-168/+300
* | | | Merge "Bug #896997: nova-vncproxy's flash socket policy port is not configura...Jenkins2011-12-051-2/+6
|\ \ \ \
| * | | | Bug #896997: nova-vncproxy's flash socket policy port is not configurableEwan Mellor2011-11-291-2/+6
* | | | | Merge "EC2 rescue/unrescue is broken, bug 899225"Jenkins2011-12-056-15/+42
|\ \ \ \ \
| * | | | | EC2 rescue/unrescue is broken, bug 899225Alex Meade2011-12-026-15/+42
* | | | | | Merge "add index to instance_uuid column in instances"Jenkins2011-12-051-0/+29
|\ \ \ \ \ \
| * | | | | | add index to instance_uuid column in instancesTrey Morris2011-12-051-0/+29
| | |_|_|/ / | |/| | | |
* | | | | | Merge "Bug #898290: iSCSI volume backend treats FLAGS.host as a hostname"Jenkins2011-12-052-5/+15
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Bug #898290: iSCSI volume backend treats FLAGS.host as a hostnameEwan Mellor2011-11-302-5/+15
* | | | | | Merge "Better exception handling during run_instance"Jenkins2011-12-021-2/+2
|\ \ \ \ \ \
| * | | | | | Better exception handling during run_instanceMark Washenberger2011-12-021-2/+2
| | |/ / / / | |/| | | |
* | | | | | Merge "Add templates for selected resource extensions."Jenkins2011-12-0213-39/+554
|\ \ \ \ \ \
| * | | | | | Add templates for selected resource extensions.Kevin L. Mitchell2011-12-0213-39/+554
* | | | | | | Merge "Fix for EC2 API part of bug 897164"Jenkins2011-12-022-3/+6
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Fix for EC2 API part of bug 897164Jimmy Bergman2011-12-022-3/+6
* | | | | | | Merge "Remove some unused imports from db"Jenkins2011-12-021-2/+0
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Remove some unused imports from dbMark McLoughlin2011-12-021-2/+0
| |/ / / / /
* | | | | | Merge "Updates simple scheduler to allow strict availability_zone scheduling"Jenkins2011-12-021-1/+3
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Updates simple scheduler to allow strict availability_zone schedulingJoseph W. Breu2011-12-011-1/+3
* | | | | | Merge "Replacing instance id's in in xenapi.vmops and the xen plugin with ins...Jenkins2011-12-021-26/+29
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Replacing instance id's in in xenapi.vmops and the xen plugin withNaveed Massjouni2011-12-021-26/+29
* | | | | | Merge "Fix to correctly report memory on Linux 3.X."Jenkins2011-12-021-2/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Fix to correctly report memory on Linux 3.X.Mandell Degerness2011-12-011-2/+2