summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | | | | | | | | Merge "Unpin PasteDeploy dependency version"Jenkins2013-03-021-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | Unpin PasteDeploy dependency versionMark McLoughlin2013-02-261-1/+1
* | | | | | | | | | | | | | | | | | | | | | Merge "Unpin routes dependency version"Jenkins2013-03-021-1/+1
|\| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Unpin routes dependency versionMark McLoughlin2013-02-261-1/+1
* | | | | | | | | | | | | | | | | | | | | | Merge "Make sure no duplicate forward rules can exist."Jenkins2013-03-023-5/+59
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | Make sure no duplicate forward rules can exist.Vishvananda Ishaya2013-02-263-5/+59
* | | | | | | | | | | | | | | | | | | | | | | Merge "sync oslo log updates"Jenkins2013-03-021-7/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | sync oslo log updatesSean Dague2013-02-201-7/+2
* | | | | | | | | | | | | | | | | | | | | | | | Merge "Fix IBM copyright strings"Jenkins2013-03-0232-48/+32
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | Fix IBM copyright stringsKurt Taylor2013-03-0132-48/+32
| | |_|_|_|/ / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | Merge "Tone down logging while waiting for conductor."Jenkins2013-03-021-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | Tone down logging while waiting for conductor.Russell Bryant2013-03-011-1/+1
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | Merge "Add instance_type_get() to virt api"Jenkins2013-03-0212-90/+95
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | Add instance_type_get() to virt apiDan Smith2013-02-2812-90/+95
* | | | | | | | | | | | | | | | | | | | | | | | Merge "Use min_ram of original image for snapshot, even with VHD"Jenkins2013-03-012-5/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | Use min_ram of original image for snapshot, even with VHDAndrew Laski2013-02-262-5/+5
* | | | | | | | | | | | | | | | | | | | | | | | | Merge "don't stack trace if long ints are passed to db"Jenkins2013-03-013-11/+24
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | don't stack trace if long ints are passed to dbSean Dague2013-02-283-11/+24
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | Add os-volumes extension to api samplesAdalberto Medeiros2013-03-0121-0/+383
| |_|_|_|/ / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | Merge "Add a 'hw_' namespace to glance hardware config properties"Jenkins2013-03-014-8/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Add a 'hw_' namespace to glance hardware config propertiesDaniel P. Berrange2013-02-274-8/+9
| | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | Merge "Fixes the Hyper-V driver's method signature"Jenkins2013-03-013-4/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | Fixes the Hyper-V driver's method signatureAlessandro Pilotti2013-03-013-4/+5
| | |/ / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | Merge "Fixes a Hyper-V live migration issue"Jenkins2013-03-012-10/+24
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | Fixes a Hyper-V live migration issueAlessandro Pilotti2013-03-012-10/+24
* | | | | | | | | | | | | | | | | | | | | | | Imported Translations from TransifexOpenStack Jenkins2013-03-011-216/+221
| |/ / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | Merge "Fix crash in quantumapi if no network or port id is specified"Jenkins2013-02-282-2/+24
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Fix crash in quantumapi if no network or port id is specifiedDan Smith2013-02-262-2/+24
| | |_|/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | Merge "Adds API Sample tests for Volume Attachments"Jenkins2013-02-2825-0/+304
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Adds API Sample tests for Volume AttachmentsTiago Mello2013-02-2825-0/+304
* | | | | | | | | | | | | | | | | | | | | Merge "Remove duplicate options(joinedload) from aggregates db code"Jenkins2013-02-281-4/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | Remove duplicate options(joinedload) from aggregates db codeJoe Gordon2013-02-281-4/+3
* | | | | | | | | | | | | | | | | | | | | | Merge "Shrink size of aggregate_metadata_get_by_host sql query"Jenkins2013-02-281-18/+5
|\| | | | | | | | | | | | | | | | | | | | | | |_|_|/ / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Shrink size of aggregate_metadata_get_by_host sql queryJoe Gordon2013-02-281-18/+5
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge "ec2 _format_security_group() accesses db when using quantum_driver"Jenkins2013-02-284-8/+101
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | ec2 _format_security_group() accesses db when using quantum_driverAaron Rosen2013-02-274-8/+101
* | | | | | | | | | | | | | | | | | | | | Merge "Run libguestfs API calls in a thread pool"Jenkins2013-02-281-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | Run libguestfs API calls in a thread poolDaniel P. Berrange2013-02-251-1/+2
* | | | | | | | | | | | | | | | | | | | | | Merge "Remove old commented out code in sqlalchemy models"Jenkins2013-02-281-6/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | Remove old commented out code in sqlalchemy modelsJoe Gordon2013-02-281-6/+0
| | |_|/ / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | Merge "Suppress retries on UnexpectedTaskStateErrors"Jenkins2013-02-282-0/+42
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | Suppress retries on UnexpectedTaskStateErrorsBrian Elliott2013-02-272-0/+42
| | |_|_|_|_|/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | Merge "Prevent hacking.py from crashing on unexpected import exception"Jenkins2013-02-281-0/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Prevent hacking.py from crashing on unexpected import exceptionJoe Gordon2013-02-271-0/+6
| | |_|_|_|_|_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | Merge "Don't blindly skip first migration."Jenkins2013-02-283-18/+21
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | Don't blindly skip first migration.Rick Harris2013-02-283-18/+21
* | | | | | | | | | | | | | | | | | | | | | Merge "Fix `with_data` handling in test-migrations."Jenkins2013-02-281-14/+11
|\| | | | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Fix `with_data` handling in test-migrations.Rick Harris2013-02-271-14/+11
* | | | | | | | | | | | | | | | | | | | | Merge "Imported Translations from Transifex"OpenStack Jenkins2013-02-281-194/+194
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Imported Translations from TransifexOpenStack Jenkins2013-02-281-194/+194