summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "Setup and teardown networks during migration"Jenkins2012-03-078-35/+204
|\
| * Setup and teardown networks during migrationTrey Morris2012-03-068-35/+204
* | Merge "fix restructuredtext formatting in docstrings that show up in the deve...Jenkins2012-03-0731-338/+395
|\ \
| * | fix restructuredtext formatting in docstrings that show up in the developer g...Doug Hellmann2012-03-0531-339/+396
* | | Merge "Fix test_attach_volume_raise_exception"Jenkins2012-03-071-2/+2
|\ \ \
| * | | Fix test_attach_volume_raise_exceptionJohannes Erdfelt2012-03-031-2/+2
* | | | Merge "Fix nova-manage floating create docs."Jenkins2012-03-072-4/+6
|\ \ \ \
| * | | | Fix nova-manage floating create docs.Lorin Hochstein2012-02-242-4/+6
* | | | | Merge "Add missing directive to tox.ini."Jenkins2012-03-071-0/+1
|\ \ \ \ \
| * | | | | Add missing directive to tox.ini.Monty Taylor2012-02-251-0/+1
* | | | | | Merge "Cleans up a bunch of unused variables in XenAPI."Jenkins2012-03-075-32/+28
|\ \ \ \ \ \
| * | | | | | Cleans up a bunch of unused variables in XenAPI.Josh Kearney2012-03-065-32/+28
* | | | | | | Merge "Fix references to novncproxy_base_url in docs."Jenkins2012-03-071-2/+5
|\ \ \ \ \ \ \
| * | | | | | | Fix references to novncproxy_base_url in docs.Anthony Young2012-03-051-2/+5
* | | | | | | | Merge "Replaces pipelines with flag for auth strategy"Jenkins2012-03-079-35/+38
|\ \ \ \ \ \ \ \
| * | | | | | | | Replaces pipelines with flag for auth strategyVishvananda Ishaya2012-03-069-35/+38
* | | | | | | | | Merge "Add support for lxc consoles."Jenkins2012-03-072-3/+10
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add support for lxc consoles.Chuck Short2012-03-052-3/+10
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge "Do not invoke kill dnsmasq if no pid file was found."Jenkins2012-03-072-1/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Do not invoke kill dnsmasq if no pid file was found.JC Martin2012-03-022-1/+3
* | | | | | | | | | Merge "Reset instance to ACTIVE when no hosts found"Jenkins2012-03-075-51/+226
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Reset instance to ACTIVE when no hosts foundAndrew Clay Shafer2012-03-065-51/+226
* | | | | | | | | | | Merge "Distinguish rootwrap Authorization vs Not found errors"Jenkins2012-03-072-5/+12
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Distinguish rootwrap Authorization vs Not found errorsPádraig Brady2012-03-062-5/+12
* | | | | | | | | | | | Merge "Update fixed_ip_associate to not use relationships"Jenkins2012-03-072-8/+44
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Update fixed_ip_associate to not use relationshipsMaru Newby2012-03-042-8/+44
* | | | | | | | | | | | | Merge "Bug #943178: aggregate extension lacks documentation"Jenkins2012-03-072-0/+187
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Bug #943178: aggregate extension lacks documentationArmando Migliaccio2012-03-062-0/+187
* | | | | | | | | | | | | | Merge "Finally fix the docs venv bug."Jenkins2012-03-062-0/+646
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Finally fix the docs venv bug.Monty Taylor2012-03-052-0/+646
* | | | | | | | | | | | | | | Merge "Shorten FLAGS.rpc_response_timeout"Jenkins2012-03-061-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Shorten FLAGS.rpc_response_timeoutAnthony Young2012-03-061-1/+1
| | |_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge "Only pass image uuids to compute api rebuild"Jenkins2012-03-062-9/+61
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Only pass image uuids to compute api rebuildMark Washenberger2012-03-062-9/+61
* | | | | | | | | | | | | | | Merge "Ensure image status filter matches glance format"Jenkins2012-03-062-4/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Ensure image status filter matches glance formatBrian Waldon2012-03-012-4/+9
* | | | | | | | | | | | | | | Merge "Better glance exception handling"Jenkins2012-03-065-21/+124
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Better glance exception handlingMark Washenberger2012-03-065-21/+124
* | | | | | | | | | | | | | | Merge "Rename files/dirs from 'rabbit' to 'rpc'."Jenkins2012-03-0611-6/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Rename files/dirs from 'rabbit' to 'rpc'.Russell Bryant2012-03-0611-6/+6
* | | | | | | | | | | | | | | | Merge "Change references to RabbitMQ to include Qpid."Jenkins2012-03-062-22/+22
|\| | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Change references to RabbitMQ to include Qpid.Russell Bryant2012-03-062-22/+22
* | | | | | | | | | | | | | | Merge "Check all migrations have downgrade in test_misc"Jenkins2012-03-061-24/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Check all migrations have downgrade in test_miscHengqing Hu2012-02-281-24/+2
* | | | | | | | | | | | | | | | Merge "Rename DistributedScheduler as FilterScheduler"Jenkins2012-03-066-23/+23
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Rename DistributedScheduler as FilterSchedulerJoe Gordon2012-03-056-23/+23
* | | | | | | | | | | | | | | | | Merge "Fixes for ec2 images"Jenkins2012-03-065-7/+73
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Fixes for ec2 imagesVishvananda Ishaya2012-03-025-7/+74
* | | | | | | | | | | | | | | | | Merge "Ensures that we don't exceed iptables chain max"Jenkins2012-03-061-1/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Ensures that we don't exceed iptables chain maxVishvananda Ishaya2012-03-021-1/+5