summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | | | Merge "Show quota 'in_use' and 'reserved' info"Jenkins2013-04-012-15/+34
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Show quota 'in_use' and 'reserved' infogengjh2013-03-282-15/+34
| | |_|_|/ / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge "Query quantum once for instance's security groups"Jenkins2013-04-014-24/+82
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Query quantum once for instance's security groupsAaron Rosen2013-03-294-24/+82
* | | | | | | | | | | | | | Merge "Delete tests.baremetal.util.new_bm_deployment()"Jenkins2013-04-011-14/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Delete tests.baremetal.util.new_bm_deployment()Arata Notsu2013-04-011-14/+0
| | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge "improve handling of an empty dnsmasq --domain"Jenkins2013-04-012-25/+36
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | improve handling of an empty dnsmasq --domainPádraig Brady2013-03-292-25/+36
* | | | | | | | | | | | | | Merge "Sync in matchmaker and qpid Conf changes from oslo"Jenkins2013-03-302-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Sync in matchmaker and qpid Conf changes from osloJoe Gordon2013-03-292-4/+4
| |/ / / / / / / / / / / /
* / / / / / / / / / / / / quantum security group driver nova list shows same groupAaron Rosen2013-03-293-10/+35
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge "Fix automatic confirmation of resizes for no-db-compute"Jenkins2013-03-296-4/+34
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Fix automatic confirmation of resizes for no-db-computeDan Smith2013-03-296-4/+34
| | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge "get context from req rather than getting a new admin context"Jenkins2013-03-295-28/+28
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | get context from req rather than getting a new admin contextAaron Rosen2013-03-285-28/+28
| | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge "Set default fixed_ip quota to unlimited."Jenkins2013-03-2925-56/+56
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Set default fixed_ip quota to unlimited.Michael Still2013-03-2925-56/+56
| | |_|_|_|_|/ / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge "'injected_files' should be base 64 encoded."Jenkins2013-03-293-7/+93
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | 'injected_files' should be base 64 encoded.Brian Elliott2013-03-293-7/+93
* | | | | | | | | | | | | Merge "Imported Translations from Transifex"OpenStack Jenkins2013-03-291-174/+170
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Imported Translations from TransifexOpenStack Jenkins2013-03-291-174/+170
| | |_|/ / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge "sync oslo db/sqlalchemy module"Jenkins2013-03-292-2/+3
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | sync oslo db/sqlalchemy moduleMichael J Fork2013-03-282-2/+3
| | |_|_|_|_|_|_|/ / / | |/| | | | | | | | |
* | | | | | | | | | | Merge "Fix missing punctuation in docstring"Jenkins2013-03-291-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Fix missing punctuation in docstringDan Smith2013-03-281-1/+1
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge "xenapi: fix support for iso boot"Jenkins2013-03-286-103/+350
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | xenapi: fix support for iso bootJohn Garbutt2013-03-286-103/+350
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge "Fix typo in the XML serialization os-services API."Jenkins2013-03-2813-6/+51
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Fix typo in the XML serialization os-services API.Andrea Rosa2013-03-2813-6/+51
| |/ / / / / / / /
* | | | | | | | | Merge "Add missing tests for db.instance_type_access_* methods"Jenkins2013-03-281-3/+89
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add missing tests for db.instance_type_access_* methodsBoris Pavlovic2013-03-261-3/+89
* | | | | | | | | | Merge "Remove race condition (in InstanceTypes)"Jenkins2013-03-283-28/+119
|\| | | | | | | | |
| * | | | | | | | | Remove race condition (in InstanceTypes)Boris Pavlovic2013-03-263-28/+119
* | | | | | | | | | Merge "always quote dhcp-domain, otherwise dnsmasq can fail to start"Jenkins2013-03-282-2/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | always quote dhcp-domain, otherwise dnsmasq can fail to startSean Dague2013-03-282-2/+2
* | | | | | | | | | | Merge "Imported Translations from Transifex"OpenStack Jenkins2013-03-281-348/+402
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / |/| | | | | | | | | |
| * | | | | | | | | | Imported Translations from TransifexOpenStack Jenkins2013-03-281-348/+402
* | | | | | | | | | | Merge "Fix quantum nic allocation when only portid is specified"Jenkins2013-03-282-1/+9
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix quantum nic allocation when only portid is specifiedDan Smith2013-03-272-1/+9
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge "Make tenant_usage fall back to instance_type_id"Jenkins2013-03-282-1/+92
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Make tenant_usage fall back to instance_type_idDan Smith2013-03-272-1/+92
| |/ / / / / / / / / /
* | | | | | | | | | | Merge "Make iptables drop action configurable."Jenkins2013-03-282-26/+147
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Make iptables drop action configurable.Michael Still2013-03-232-26/+147
* | | | | | | | | | | | Rework time handling in periodic tasks.Michael Still2013-03-282-25/+80
| |_|_|_|/ / / / / / / |/| | | | | | | | | |
* | | | | | | | | | | Merge "Adding netmask to dnsmasq argument --dhcp-range"Jenkins2013-03-282-2/+5
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Adding netmask to dnsmasq argument --dhcp-rangeDavid Hill2013-03-262-2/+5
* | | | | | | | | | | Merge "Use format_message on exceptions instead of str()"Jenkins2013-03-2719-52/+59
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Use format_message on exceptions instead of str()Nikola Dipanov2013-03-2719-52/+59
* | | | | | | | | | | | Merge "Add a format_message method to the Exceptions"Jenkins2013-03-272-0/+35
|\| | | | | | | | | | |
| * | | | | | | | | | | Add a format_message method to the ExceptionsNikola Dipanov2013-03-272-0/+35
| | |_|_|_|/ / / / / / | |/| | | | | | | | |