summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "Fix for failure of periodic instance cleanup"Jenkins2013-07-012-5/+7
|\
| * Fix for failure of periodic instance cleanupDavid McNally2013-06-262-5/+7
* | Merge "Sync db.models and migrations."Jenkins2013-07-011-11/+22
|\ \
| * | Sync db.models and migrations.Svetlana Shturm2013-06-251-11/+22
* | | Merge "Fix types in test_ec2_ids_not_found_are_printable"Jenkins2013-07-011-10/+10
|\ \ \
| * | | Fix types in test_ec2_ids_not_found_are_printableRoman Podolyaka2013-06-251-10/+10
* | | | Merge "Port images functionality to v3 API Part 2"Jenkins2013-06-305-75/+106
|\ \ \ \
| * | | | Port images functionality to v3 API Part 2Chris Yeoh2013-06-295-75/+106
* | | | | Merge "Port server_diagnostics extension to v3 API Part2"Jenkins2013-06-305-17/+21
|\ \ \ \ \
| * | | | | Port server_diagnostics extension to v3 API Part2Chris Yeoh2013-06-295-17/+21
| |/ / / /
* | | | | Merge "Port cells extension to v3 API Part 2"Jenkins2013-06-295-22/+20
|\ \ \ \ \
| * | | | | Port cells extension to v3 API Part 2Chris Yeoh2013-06-295-22/+20
| |/ / / /
* | | | | Merge "fix invalid logging"Jenkins2013-06-291-2/+10
|\ \ \ \ \
| * | | | | fix invalid loggingMate Lakat2013-06-281-2/+10
* | | | | | Merge "Merged flavor_swap extension into core API"Jenkins2013-06-295-126/+50
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Merged flavor_swap extension into core APIAlexei Kornienko2013-06-275-126/+50
* | | | | | Merge "Imported Translations from Transifex"OpenStack Jenkins2013-06-2941-18260/+47815
|\ \ \ \ \ \
| * | | | | | Imported Translations from TransifexOpenStack Jenkins2013-06-2841-18260/+47815
* | | | | | | Merge "Report the az based on the value in the instance table."Jenkins2013-06-285-14/+94
|\ \ \ \ \ \ \
| * | | | | | | Report the az based on the value in the instance table.Joshua Harlow2013-06-265-14/+94
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge "Fix sqlalchemy utils."Jenkins2013-06-282-4/+39
|\ \ \ \ \ \ \
| * | | | | | | Fix sqlalchemy utils.Yuriy Zveryanskyy2013-06-272-4/+39
* | | | | | | | Merge "Port flavor_disabled extension to v3 API Part 2"Jenkins2013-06-285-27/+27
|\ \ \ \ \ \ \ \
| * | | | | | | | Port flavor_disabled extension to v3 API Part 2Alexei Kornienko2013-06-275-27/+27
* | | | | | | | | Merge "Port flavor_disabled extension to v3 API Part 1"Jenkins2013-06-282-0/+195
|\| | | | | | | |
| * | | | | | | | Port flavor_disabled extension to v3 API Part 1Alexei Kornienko2013-06-272-0/+195
* | | | | | | | | Merge "VNC console does not work with VCDriver"Jenkins2013-06-286-13/+308
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | VNC console does not work with VCDriverhartsocks2013-06-276-13/+308
* | | | | | | | | | Merge "Port cells extension to v3 API Part 1"Jenkins2013-06-282-0/+821
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | |
| * | | | | | | | | Port cells extension to v3 API Part 1Chris Yeoh2013-06-142-0/+821
* | | | | | | | | | Merge "Port server_diagnostics extension to v3 API Part1"Jenkins2013-06-282-0/+151
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Port server_diagnostics extension to v3 API Part1Chris Yeoh2013-06-172-0/+151
* | | | | | | | | | | Merge "Allow retrying network allocations separately"Jenkins2013-06-282-19/+147
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Allow retrying network allocations separatelyChris Behrens2013-06-262-19/+147
* | | | | | | | | | | | Merge "db.compute_node_update: ignore values['update_at']"Jenkins2013-06-282-2/+14
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | db.compute_node_update: ignore values['update_at']Peter Feiner2013-06-262-2/+14
| | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge "Port images functionality to v3 API Part 1"Jenkins2013-06-282-0/+1550
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Port images functionality to v3 API Part 1Chris Yeoh2013-06-282-0/+1550
* | | | | | | | | | | | | Merge "Add AggregateRamFilter"Jenkins2013-06-283-5/+119
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Add AggregateRamFilterQiu Yu2013-06-213-5/+119
* | | | | | | | | | | | | | Merge "Add AggregateCoreFilter"Jenkins2013-06-283-4/+105
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Add AggregateCoreFilterQiu Yu2013-06-213-4/+105
| |/ / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge "Moves scheduler.manager._set_vm_state_and_notify to scheduler.utils"Jenkins2013-06-282-52/+54
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Moves scheduler.manager._set_vm_state_and_notify to scheduler.utilsTiago Mello2013-06-282-52/+54
| | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge "Ignore lifecycle events for non-existent instances"Jenkins2013-06-282-1/+42
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Ignore lifecycle events for non-existent instancesPeter Feiner2013-06-272-1/+42
* | | | | | | | | | | | | | Merge "Better default for my_ip if 8.8.8.8 is unreachable"Jenkins2013-06-283-1/+145
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Better default for my_ip if 8.8.8.8 is unreachableDavanum Srinivas2013-06-263-1/+145
* | | | | | | | | | | | | | Merge "No support for double nested 64 bit guest using VCDriver"Jenkins2013-06-281-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | No support for double nested 64 bit guest using VCDriverJacob Cherkas2013-06-181-0/+4