summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "xenapi: Added logging for sparse copy"Jenkins2013-06-052-2/+38
|\
| * xenapi: Added logging for sparse copyAarti Kriplani2013-06-052-2/+38
* | Merge "Improve Python 3.x compatibility"Jenkins2013-06-0525-36/+79
|\ \ | |/ |/|
| * Improve Python 3.x compatibilityDirk Mueller2013-06-0125-36/+79
* | Merge "Don't log warn if v3 API is disabled."Jenkins2013-06-051-1/+1
|\ \
| * | Don't log warn if v3 API is disabled.Dan Prince2013-06-031-1/+1
* | | Merge "Make object actions pass positional arguments"Jenkins2013-06-054-22/+33
|\ \ \
| * | | Make object actions pass positional argumentsDan Smith2013-06-044-22/+33
* | | | Merge "_s3_create handles image being deleted"Jenkins2013-06-051-64/+69
|\ \ \ \
| * | | | _s3_create handles image being deletedChris Yeoh2013-05-301-64/+69
* | | | | Merge "Launch_at and terminated_at on server(s) response"Jenkins2013-06-0534-38/+744
|\ \ \ \ \
| * | | | | Launch_at and terminated_at on server(s) responseAndrew Melton2013-05-3134-38/+744
* | | | | | Merge "Fix bug where consoleauth depended on remote conductor service"Jenkins2013-06-051-2/+2
|\ \ \ \ \ \
| * | | | | | Fix bug where consoleauth depended on remote conductor serviceSam Morrison2013-05-311-2/+2
* | | | | | | Merge "Make instance object tolerate isotime strings"Jenkins2013-06-054-6/+22
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | Make instance object tolerate isotime stringsDan Smith2013-06-034-6/+22
* | | | | | | Merge "Add fake_instance.py"Jenkins2013-06-051-0/+40
|\| | | | | |
| * | | | | | Add fake_instance.pyDan Smith2013-06-031-0/+40
* | | | | | | Merge "Enhance multipath parsing"Jenkins2013-06-052-11/+72
|\ \ \ \ \ \ \
| * | | | | | | Enhance multipath parsingPatrick Schaefer2013-05-292-11/+72
* | | | | | | | Merge "IPMI driver sets bootdev option persistently."Jenkins2013-06-041-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | IPMI driver sets bootdev option persistently.Devananda van der Veen2013-05-231-1/+1
* | | | | | | | | Merge "Call scheduler for run_instance from conductor"Jenkins2013-06-0420-205/+708
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Call scheduler for run_instance from conductorAndrew Laski2013-06-0420-205/+708
* | | | | | | | | | Merge "Fix postgresql failures related to Data type"Jenkins2013-06-045-40/+136
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Fix postgresql failures related to Data typeMauro S. M. Rodrigues2013-06-035-40/+136
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge "Remove unused launch_time from instance"Jenkins2013-06-049-15/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Remove unused launch_time from instanceChris Behrens2013-05-319-15/+1
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | Merge "Ports consoles API to v3 API"Jenkins2013-06-043-0/+440
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Ports consoles API to v3 APIChris Yeoh2013-06-013-0/+440
* | | | | | | | | | Merge "Link to explanation of --checksum-full rule."Jenkins2013-06-041-0/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Link to explanation of --checksum-full rule.Russell Bryant2013-06-031-0/+2
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge "Avoiding multiple code loops in filter scheduler"Jenkins2013-06-041-0/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Avoiding multiple code loops in filter schedulerYang Yu2013-06-041-0/+2
| | |_|_|_|_|_|_|/ / | |/| | | | | | | |
* | | | | | | | | | Merge "Stop libvirt errors from outputting to strerr"Jenkins2013-06-042-0/+10
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Stop libvirt errors from outputting to strerrHans Lindgren2013-06-032-0/+10
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Merge "python3: Add py33 to tox.ini"Jenkins2013-06-031-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | python3: Add py33 to tox.iniChuck Short2013-06-011-1/+1
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Merge "Adds ability to black/whitelist v3 API extensions"Jenkins2013-06-034-14/+139
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Adds ability to black/whitelist v3 API extensionsChris Yeoh2013-06-034-14/+139
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge "Imported Translations from Transifex"OpenStack Jenkins2013-06-0338-649/+538
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Imported Translations from TransifexOpenStack Jenkins2013-06-0338-649/+538
* | | | | | | | | | Merge "Add Davanum to the mailmap."Jenkins2013-06-031-0/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Add Davanum to the mailmap.Davanum Srinivas2013-06-031-0/+1
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge "Moved sample network creation out of unittest base class constructor."Jenkins2013-06-036-3/+13
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Moved sample network creation out of unittest base class constructor.Sergey Skripnick2013-05-246-3/+13
* | | | | | | | | Merge "In utils.tempdir, pass CONF.tempdir as an argument."Jenkins2013-06-031-2/+4
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | In utils.tempdir, pass CONF.tempdir as an argument.David Ripton2013-05-281-2/+4
* | | | | | | | | | Merge "Imported Translations from Transifex"OpenStack Jenkins2013-06-0338-13344/+15099
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Imported Translations from TransifexOpenStack Jenkins2013-06-0238-13344/+15099
| | |_|_|/ / / / / / | |/| | | | | | | |