summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "Call detach_volume when attach fails"Jenkins2012-02-282-1/+16
|\
| * Call detach_volume when attach failsBrian Waldon2012-02-272-1/+16
* | Use assertDictMatch to keep 2.6 unit tests passingMark Washenberger2012-02-281-1/+1
* | Merge "Handle case where instance['info_cache'] is None"Jenkins2012-02-282-2/+4
|\ \
| * | Handle case where instance['info_cache'] is NoneChris Behrens2012-02-282-2/+4
* | | Merge "TypeError API exceptions get logged incorrectly"Jenkins2012-02-281-2/+3
|\ \ \ | |/ / |/| |
| * | TypeError API exceptions get logged incorrectlyChris Behrens2012-02-281-2/+3
* | | Merge "Fixes cloudpipe extension to work with keystone"Jenkins2012-02-2810-273/+151
|\ \ \
| * | | Fixes cloudpipe extension to work with keystoneVishvananda Ishaya2012-02-2610-273/+151
* | | | Merge "Add utils.tempdir() context manager for easy temp dirs"Jenkins2012-02-2810-326/+261
|\ \ \ \ | |_|/ / |/| | |
| * | | Add utils.tempdir() context manager for easy temp dirsJohannes Erdfelt2012-02-2810-326/+261
| | |/ | |/|
* / | Remove monkey patching in carrot RPC driverJohannes Erdfelt2012-02-281-3/+0
|/ /
* | Merge "Adds temporary chown to sparse_copy."Jenkins2012-02-272-19/+44
|\ \
| * | Adds temporary chown to sparse_copy.Rick Harris2012-02-272-19/+44
* | | make nova-network usable with Python < 2.6.5Christian Berendt2012-02-271-7/+12
|/ /
* | Merge "Re-adds ssl to kombu configuration and adds flags that are needed to p...Jenkins2012-02-273-1/+103
|\ \
| * | Re-adds ssl to kombu configuration and adds flags that are needed to pass thr...Joshua Harlow2012-02-273-1/+103
* | | Merge "Fix bug 900864 Quantum Manager flag for IP injection."Jenkins2012-02-271-0/+1
|\ \ \ | |/ / |/| |
| * | Fix bug 900864 Quantum Manager flag for IP injection.Dave Lapsley2012-02-231-0/+1
* | | Merge "Remove unused import"Jenkins2012-02-271-1/+0
|\ \ \
| * | | Remove unused importMark McLoughlin2012-02-271-1/+0
* | | | Merge "Imported Translations from Launchpad"OpenStack Jenkins2012-02-2719-34478/+26008
|\ \ \ \
| * | | | Imported Translations from LaunchpadOpenStack Jenkins2012-02-2619-34478/+26008
* | | | | Merge "Cleanup .rescue files in libvirt driver unrescue."Jenkins2012-02-271-0/+5
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Cleanup .rescue files in libvirt driver unrescue.Dan Prince2012-02-261-0/+5
| | |_|/ | |/| |
* | | | Make sure detail view works for volume snaphotsVishvananda Ishaya2012-02-264-4/+102
| |/ / |/| |
* | | Update EC2KeystoneAuth to grab tenant 'id'.Dan Prince2012-02-251-1/+1
|/ /
* | Merge "Monkey patch migrate < 0.7.3"Jenkins2012-02-252-16/+38
|\ \
| * | Monkey patch migrate < 0.7.3Jason Kölker2012-02-242-16/+38
* | | Fixes bug lp#940734 - Adding manager import so AuthMiddleware worksmbasnight2012-02-242-2/+3
* | | Merge "fix unicode triggered failure in AuthManager"Jenkins2012-02-252-1/+2
|\ \ \
| * | | fix unicode triggered failure in AuthManagerRussell Sim2012-02-242-1/+2
| | |/ | |/|
* | | Merge "Clean stale lockfiles on service startup : fixes bug 785955"Jenkins2012-02-254-1/+298
|\ \ \
| * | | Clean stale lockfiles on service startup : fixes bug 785955Mike Pittaro2012-02-244-1/+298
* | | | Merge "Improve unit test coverage per bug/934566."Jenkins2012-02-252-14/+180
|\ \ \ \ | |/ / / |/| | |
| * | | Improve unit test coverage per bug/934566.Michael Still2012-02-232-14/+180
* | | | Merge "Don't delete security group in use from OS API."Jenkins2012-02-242-0/+22
|\ \ \ \
| * | | | Don't delete security group in use from OS API.Russell Bryant2012-02-232-0/+22
* | | | | Merge "Example config_drive init script, label the config drive"Jenkins2012-02-243-5/+77
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Example config_drive init script, label the config driveJustin Santa Barbara2012-02-243-5/+77
| | |_|/ | |/| |
* | | | Merge "Copy data when migration dst is on a different FS"Jenkins2012-02-241-7/+8
|\ \ \ \
| * | | | Copy data when migration dst is on a different FSMark Washenberger2012-02-231-7/+8
* | | | | Fix MANIFEST.in to include missing filesThierry Carrez2012-02-241-0/+6
| |/ / / |/| | |
* | | | Merge "Fix instance stop in EC2 create_image"Jenkins2012-02-241-1/+1
|\ \ \ \
| * | | | Fix instance stop in EC2 create_imageJulien Danjou2012-02-221-1/+1
* | | | | Merge "Fix vnc docs: novaclient now supports vnc consoles."Jenkins2012-02-241-4/+0
|\ \ \ \ \
| * | | | | Fix vnc docs: novaclient now supports vnc consoles.Anthony Young2012-02-211-4/+0
* | | | | | Merge "libvirt vif-plugging fixes. Fixes bug 939252 , bug 939254"Jenkins2012-02-243-1/+188
|\ \ \ \ \ \
| * | | | | | libvirt vif-plugging fixes. Fixes bug 939252 , bug 939254Dan Wendlandt2012-02-223-1/+188
* | | | | | | Merge "Fixes error if Melange returns no networks"Jenkins2012-02-241-1/+1
|\ \ \ \ \ \ \