summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge "Fix ResourceGroup validate when there are removal_policies" into stabl...2015.1.0rc22015.1.0Jenkins2015-04-232-5/+61
|\
| * Fix ResourceGroup validate when there are removal_policiesSteven Hardy2015-04-232-5/+61
* | Merge "Fix unicodeerror when heat-engine start" into stable/kiloJenkins2015-04-231-1/+3
|\ \
| * | Fix unicodeerror when heat-engine startEthan Lynn2015-04-231-1/+3
| |/
* | Merge "Add v6-fixed-ip support for nova server" into stable/kiloJenkins2015-04-232-1/+10
|\ \
| * | Add v6-fixed-ip support for nova serverEthan Lynn2015-04-232-1/+10
| |/
* | Merge "Set auth_encryption_key option to be secret" into stable/kiloJenkins2015-04-231-2/+4
|\ \ | |/ |/|
| * Set auth_encryption_key option to be secretEric Brown2015-04-211-2/+4
* | Persist parent_resource_name and make sure it's availableAngus Salkeld2015-04-2215-54/+135
* | Merge "Set IMAGE_UPDATE_POLICY default to REBUILD" into stable/kiloJenkins2015-04-222-10/+3
|\ \
| * | Set IMAGE_UPDATE_POLICY default to REBUILDEthan Lynn2015-04-222-10/+3
* | | Merge "To attach interface for server when using 'uuid'" into stable/kiloJenkins2015-04-222-0/+48
|\ \ \
| * | | To attach interface for server when using 'uuid'huangtianhua2015-04-222-0/+48
| |/ /
* | | Merge "Novaclient v2 instead of v1_1" into stable/kiloJenkins2015-04-2232-116/+121
|\ \ \
| * | | Novaclient v2 instead of v1_1Michal Rostecki2015-04-2232-116/+121
| |/ /
* | | Merge "Cleans nullable=True in db model column declaration" into stable/kiloJenkins2015-04-222-12/+8
|\ \ \
| * | | Cleans nullable=True in db model column declarationKanagaraj Manickam2015-04-222-12/+8
| |/ /
* | | Merge "Don't re-bind environment for get_file during stack update" into stabl...Jenkins2015-04-222-1/+50
|\ \ \
| * | | Don't re-bind environment for get_file during stack updateZane Bitter2015-04-222-1/+50
| |/ /
* | | Merge "Release Import of Translations from Transifex" into stable/kiloJenkins2015-04-226-2275/+0
|\ \ \ | |/ / |/| |
| * | Release Import of Translations from TransifexAndreas Jaeger2015-04-206-2275/+0
* | | Merge "Updated from global requirements" into stable/kiloJenkins2015-04-221-11/+11
|\ \ \
| * | | Updated from global requirementsOpenStack Proposal Bot2015-04-201-11/+11
| |/ /
* | | Merge "Make SoftwareDeployments work for non-CREATE actions" into stable/kiloJenkins2015-04-212-4/+3
|\ \ \ | |_|/ |/| |
| * | Make SoftwareDeployments work for non-CREATE actionsSteven Hardy2015-04-152-4/+3
* | | Fix sqlalchemy migration script 061 for DB2 backendEthan Lynn2015-04-201-2/+28
| |/ |/|
* | update .gitreview for stable/kiloThierry Carrez2015-04-171-0/+1
|/
* Merge "Fix stack update issue"2015.1.0rc1proposed/kiloJenkins2015-04-072-1/+29
|\
| * Fix stack update issueEthan Lynn2015-04-022-1/+29
* | Merge "Do not resolve neutron resource attributes when resource_id is None"Jenkins2015-04-062-9/+16
|\ \
| * | Do not resolve neutron resource attributes when resource_id is NoneRandall Burt2015-04-032-9/+16
* | | Merge "Imported Translations from Transifex"Jenkins2015-04-063-81/+100
|\ \ \
| * | | Imported Translations from TransifexOpenStack Proposal Bot2015-04-063-81/+100
* | | | Merge "Fix functional test_signal_during_suspend"Jenkins2015-04-061-0/+1
|\ \ \ \
| * | | | Fix functional test_signal_during_suspendPavlo Shchelokovskyy2015-04-061-0/+1
| |/ / /
* | | | Merge "Updated from global requirements"Jenkins2015-04-061-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Updated from global requirementsOpenStack Proposal Bot2015-04-031-1/+1
* | | | Merge "Set stack status to FAILED when engine is down"Jenkins2015-04-037-0/+112
|\ \ \ \ | |_|/ / |/| | |
| * | | Set stack status to FAILED when engine is downEthan Lynn2015-04-027-0/+112
| | |/ | |/|
* | | Merge "Do sleep(0) for first task sleep"Jenkins2015-04-032-10/+11
|\ \ \ | |_|/ |/| |
| * | Do sleep(0) for first task sleepSteve Baker2015-04-022-10/+11
* | | Merge "Fix stack-update for OS::Nova::Server resource"Jenkins2015-04-022-12/+90
|\ \ \
| * | | Fix stack-update for OS::Nova::Server resourceRabi Mishra2015-04-022-12/+90
* | | | Imported Translations from TransifexOpenStack Proposal Bot2015-04-0210-519/+481
| |_|/ |/| |
* | | Merge "Ignore migrating environments for deleted stacks"Jenkins2015-04-022-17/+28
|\ \ \
| * | | Ignore migrating environments for deleted stacksRandall Burt2015-04-012-17/+28
| | |/ | |/|
* | | Merge "Create an event when signalling fails"Jenkins2015-04-023-2/+12
|\ \ \
| * | | Create an event when signalling failsAngus Salkeld2015-04-023-2/+12
| |/ /
* | | Merge "Correctly initialize copies of stack during updating stack"Jenkins2015-04-025-35/+212
|\ \ \ | |/ / |/| |
| * | Correctly initialize copies of stack during updating stackDeliang Fan2015-03-315-35/+212