summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* Merge "DB API : tolerate None values to _encrypt" into milestone-proposedJenkins2013-10-102-1/+13
|\
| * DB API : tolerate None values to _encryptSteven Hardy2013-10-102-1/+13
* | Merge "Fix RequestContext.to_dict user/username inconsistency" into milestone...Jenkins2013-10-102-1/+62
|\ \ | |/
| * Fix RequestContext.to_dict user/username inconsistencySteven Hardy2013-10-102-1/+62
* | Merge "Fix the signal details string" into milestone-proposedJenkins2013-10-102-1/+62
|\ \
| * | Fix the signal details stringAngus Salkeld2013-10-102-1/+62
| |/
* | Merge "Add some docs on how to setup Ceilometer to use Alarms" into milestone...Jenkins2013-10-101-2/+12
|\ \
| * | Add some docs on how to setup Ceilometer to use AlarmsAngus Salkeld2013-10-101-2/+12
| |/
* | Merge "Add cinder prop image, deprecate imageRef" into milestone-proposedJenkins2013-10-102-7/+23
|\ \
| * | Add cinder prop image, deprecate imageRefSteve Baker2013-10-102-7/+23
| |/
* | Fix possible race issue with test_engine_serviceSteven Hardy2013-10-101-8/+16
|/
* Merge "Don't try validate TemplateResource properties in template_validate" i...Jenkins2013-10-091-0/+6
|\
| * Don't try validate TemplateResource properties in template_validateAngus Salkeld2013-10-091-0/+6
* | Move the registration of the global env to after plugin resourcesAngus Salkeld2013-10-092-2/+32
* | Make the testing of resource loading easierAngus Salkeld2013-10-092-18/+34
|/
* Merge "allow "members" property to be absent" into milestone-proposedJenkins2013-10-081-2/+2
|\
| * allow "members" property to be absentStephen Gran2013-10-081-2/+2
* | Merge "HOT str_replace default to empty string for param" into milestone-prop...Jenkins2013-10-081-1/+1
|\ \
| * | HOT str_replace default to empty string for paramRandall Burt2013-10-081-1/+1
| |/
* | Merge "Make sure that nested stacks have their watch rules checked" into mile...Jenkins2013-10-081-6/+14
|\ \
| * | Make sure that nested stacks have their watch rules checkedAngus Salkeld2013-10-081-6/+14
* | | Merge "Start the watcher task if a nested stack has watches" into milestone-p...Jenkins2013-10-082-11/+48
|\ \ \ | |/ /
| * | Start the watcher task if a nested stack has watchesAngus Salkeld2013-10-082-11/+48
* | | Merge "Add a new db api stack_get_all_by_owner_id" into milestone-proposedJenkins2013-10-082-0/+10
|\ \ \ | |/ /
| * | Add a new db api stack_get_all_by_owner_idAngus Salkeld2013-10-082-0/+10
| |/
* | Merge "Fix clashing loop variables in TemplateResource" into milestone-proposedJenkins2013-10-081-2/+2
|\ \
| * | Fix clashing loop variables in TemplateResourceAngus Salkeld2013-10-081-2/+2
| |/
* | Merge "Handle NetworkNotFoundClient and PortNotFoundClient" into milestone-pr...Jenkins2013-10-084-16/+29
|\ \
| * | Handle NetworkNotFoundClient and PortNotFoundClientSteve Baker2013-10-084-16/+29
| |/
* | Merge "Handle BadRequest in VolumeDetachTask" into milestone-proposedJenkins2013-10-082-3/+9
|\ \
| * | Handle BadRequest in VolumeDetachTaskSteve Baker2013-10-082-3/+9
| |/
* | Merge "It is necessary to update pool_id for Neutron LB" into milestone-proposedJenkins2013-10-081-1/+1
|\ \
| * | It is necessary to update pool_id for Neutron LBStephen Gran2013-10-081-1/+1
| |/
* | Merge "resource_data saved unencrypted" into milestone-proposedJenkins2013-10-082-6/+17
|\ \
| * | resource_data saved unencryptedAndrew Plunk2013-10-082-6/+17
| |/
* | resource_id check on router gateway, interface deleteSteve Baker2013-10-081-0/+4
|/
* Merge "Updated from global requirements"2013.2.rc1OpenStack Jenkins2013-10-033-6/+6
|\
| * Updated from global requirementsOpenStack Jenkins2013-10-013-6/+6
* | Merge "Fix F17 CFN link in Getting Started"Jenkins2013-10-021-1/+1
|\ \
| * | Fix F17 CFN link in Getting StartedStephen Gordon2013-10-021-1/+1
* | | Merge "Imported Translations from Transifex"OpenStack Jenkins2013-10-0220-2841/+5466
|\ \ \
| * | | Imported Translations from TransifexOpenStack Jenkins2013-10-0220-2841/+5466
* | | | Merge "Purge ubuntu getting started guide of old info"Jenkins2013-10-021-214/+4
|\ \ \ \
| * | | | Purge ubuntu getting started guide of old infoSteven Hardy2013-10-011-214/+4
* | | | | Merge "Purge Fedora getting started of old info"Jenkins2013-10-021-334/+8
|\ \ \ \ \ | |/ / / /
| * | | | Purge Fedora getting started of old infoSteven Hardy2013-10-011-334/+8
* | | | | Merge "Add the "show" attribute to the neurton attribute_schema"Jenkins2013-10-027-4/+11
|\ \ \ \ \
| * | | | | Add the "show" attribute to the neurton attribute_schemaAngus Salkeld2013-10-027-4/+11
* | | | | | Merge "Add _() around the attributes_schema in net.py"Jenkins2013-10-021-5/+5
|\ \ \ \ \ \ | |/ / / / / | | | | / / | |_|_|/ / |/| | | |
| * | | | Add _() around the attributes_schema in net.pyAngus Salkeld2013-10-021-5/+5
| | |/ / | |/| |