summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Remove predecessor column from raw_template.Anant Patil2015-06-114-3/+56
* Merge "Add unit test case for Keystone client plug-in for domain"Jenkins2015-06-111-0/+76
|\
| * Add unit test case for Keystone client plug-in for domainKanagaraj Manickam2015-06-101-0/+76
* | Merge "Add unit test case for Keystone client plug-in for project"Jenkins2015-06-111-0/+76
|\ \ | |/
| * Add unit test case for Keystone client plug-in for projectKanagaraj Manickam2015-06-101-0/+76
* | Merge "Add unit test case for Keystone client plug-in for role"Jenkins2015-06-111-0/+76
|\ \ | |/
| * Add unit test case for Keystone client plug-in for roleKanagaraj Manickam2015-06-101-0/+76
* | Merge "Convergence resource operations"Jenkins2015-06-114-23/+151
|\ \
| * | Convergence resource operationsKanagaraj Manickam2015-06-104-23/+151
* | | Merge "Clean openstack common modules"Jenkins2015-06-112-411/+0
|\ \ \
| * | | Clean openstack common modulesThomas Herve2015-06-102-411/+0
* | | | Merge "Updated from global requirements"Jenkins2015-06-112-6/+6
|\ \ \ \
| * | | | Updated from global requirementsOpenStack Proposal Bot2015-06-112-6/+6
* | | | | Merge "Copy environment before decrypting"Jenkins2015-06-111-0/+3
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Copy environment before decryptingJason Dunsmore2015-06-101-0/+3
* | | | | Merge "Move mistral resources in-tree"Jenkins2015-06-1014-95/+102
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Move mistral resources in-treeMiguel Grinberg2015-06-0914-95/+102
* | | | | Merge "Move the heat_keystoneclient_v2 contrib package"Jenkins2015-06-109-90/+33
|\ \ \ \ \
| * | | | | Move the heat_keystoneclient_v2 contrib packageMiguel Grinberg2015-06-099-90/+33
* | | | | | Merge "Add explicit return to _get_property_value()"Jenkins2015-06-101-0/+2
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Add explicit return to _get_property_value()Zane Bitter2015-06-101-0/+2
* | | | | | Sync with latest oslo-incubatorDavanum Srinivas2015-06-104-11/+11
|/ / / / /
* | | | | Merge "Fix block_device_mapping property validation when using get_attr"Jenkins2015-06-102-2/+21
|\ \ \ \ \
| * | | | | Fix block_device_mapping property validation when using get_attrRabi Mishra2015-06-102-2/+21
| |/ / / /
* | | | | Merge "Updated from global requirements"Jenkins2015-06-102-4/+4
|\ \ \ \ \
| * | | | | Updated from global requirementsOpenStack Proposal Bot2015-06-092-4/+4
* | | | | | Merge "Merge tag '2015.1.0'"Jenkins2015-06-100-0/+0
|\ \ \ \ \ \
| * \ \ \ \ \ Merge tag '2015.1.0'Jeremy Stanley2015-06-090-0/+0
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| | * | | | | 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
| | |\ \ \ \ \ \ \