Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | Merge "Fix race in ZaqarEventSinkTest.test_events" into stable/ocata | Jenkins | 2017-09-12 | 1 | -14/+23 | |
|\ \ \ \ | ||||||
| * | | | | Fix race in ZaqarEventSinkTest.test_events | rabi | 2017-08-15 | 1 | -14/+23 | |
* | | | | | Merge "Don't set metadata for deleted resources" into stable/ocata8.0.4 | Jenkins | 2017-08-21 | 4 | -11/+42 | |
|\ \ \ \ \ | ||||||
| * | | | | | Don't set metadata for deleted resources | Crag Wolfe | 2017-04-25 | 4 | -11/+42 | |
* | | | | | | Merge "Fix snapshot delete in convergence" into stable/ocata | Jenkins | 2017-08-18 | 3 | -45/+9 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Fix snapshot delete in convergence | Thomas Herve | 2017-07-05 | 3 | -45/+9 | |
* | | | | | | | Merge "Cache policy enforcer" into stable/ocata | Jenkins | 2017-08-18 | 2 | -1/+10 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Cache policy enforcer | Thomas Herve | 2017-07-27 | 2 | -1/+10 | |
| | |_|_|/ / / | |/| | | | | | ||||||
* | | | | | | | Merge "Log unhandled exceptions in worker" into stable/ocata | Jenkins | 2017-08-18 | 1 | -0/+16 | |
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | ||||||
| * | | | | | | Log unhandled exceptions in worker | Zane Bitter | 2017-07-27 | 1 | -0/+16 | |
| |/ / / / / | ||||||
* | | | | | | Merge "Mark stack failed when exception raised in resource check" into stable... | Jenkins | 2017-08-17 | 1 | -11/+20 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Mark stack failed when exception raised in resource check | Zane Bitter | 2017-08-15 | 1 | -11/+20 | |
| | |_|_|/ / | |/| | | | | ||||||
* | | | | | | Merge "Optimise the function.dep_attrs() function" into stable/ocata | Jenkins | 2017-08-17 | 1 | -1/+1 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Optimise the function.dep_attrs() function | Zane Bitter | 2017-07-26 | 1 | -1/+1 | |
| | |/ / / / | |/| | | | | ||||||
* | | | | | | Merge "Validate property values in nested stacks again" into stable/ocata | Jenkins | 2017-08-17 | 6 | -47/+46 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Validate property values in nested stacks again | Zane Bitter | 2017-05-12 | 6 | -47/+46 | |
* | | | | | | | Merge "Fix OS::Zaqar::MistralSubscription with mistralclient 3.0" into stable... | Jenkins | 2017-08-17 | 2 | -3/+7 | |
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | ||||||
| * | | | | | | Fix OS::Zaqar::MistralSubscription with mistralclient 3.0 | Zane Bitter | 2017-07-27 | 2 | -3/+7 | |
| | |/ / / / | |/| | | | | ||||||
* | | | | | | Merge "Handle post-delete hooks correctly" into stable/ocata | Jenkins | 2017-08-17 | 2 | -5/+6 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Handle post-delete hooks correctly | Thomas Herve | 2017-07-27 | 2 | -5/+6 | |
| |/ / / / / | ||||||
* | | | | | | Merge "Reorder the update task for nova server resource" into stable/ocata | Jenkins | 2017-08-17 | 1 | -8/+8 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Reorder the update task for nova server resource | huangtianhua | 2017-07-27 | 1 | -8/+8 | |
| |/ / / / / | ||||||
* | | | | | | Merge "Fix ResourceActionNotSupported errors in log" into stable/ocata | Jenkins | 2017-08-17 | 2 | -3/+4 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Fix ResourceActionNotSupported errors in log | Zane Bitter | 2017-07-27 | 2 | -3/+4 | |
| |/ / / / / | ||||||
* | | | | | | Merge "Fix subnet validate() for subnetpool resource ref" into stable/ocata | Jenkins | 2017-08-17 | 2 | -2/+42 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Fix subnet validate() for subnetpool resource ref | rabi | 2017-07-27 | 2 | -2/+42 | |
| |/ / / / / | ||||||
* | | | | | | Merge "Fix handle_create of ResourceGroup" into stable/ocata | Jenkins | 2017-08-17 | 1 | -2/+1 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Fix handle_create of ResourceGroup | rabi | 2017-07-27 | 1 | -2/+1 | |
| |/ / / / / | ||||||
* | | | | | | Merge "Fix devstack plugin for multinode deployment issues" into stable/ocata | Jenkins | 2017-08-17 | 2 | -5/+4 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Fix devstack plugin for multinode deployment issues | rabi | 2017-08-16 | 2 | -5/+4 | |
| | |_|/ / / | |/| | | | | ||||||
* | | | | | | Merge "Resolve Macros when copying templates" into stable/ocata | Jenkins | 2017-08-16 | 1 | -0/+14 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Resolve Macros when copying templates | Zane Bitter | 2017-07-05 | 1 | -0/+14 | |
| | |_|_|/ / | |/| | | | | ||||||
* | | | | | | Merge "Fix snapshot/restore of volumes" into stable/ocata | Jenkins | 2017-08-16 | 2 | -12/+14 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Fix snapshot/restore of volumes | Thomas Herve | 2017-06-15 | 2 | -12/+14 | |
* | | | | | | | Imported Translations from Zanata | OpenStack Proposal Bot | 2017-08-14 | 11 | -50/+38 | |
| |_|/ / / / |/| | | | | | ||||||
* | | | | | | To merge the occ data for OS::Heat::DeployedServer | huangtianhua | 2017-08-01 | 2 | -4/+18 | |
* | | | | | | Merge "Fix restore with convergence" into stable/ocata | Jenkins | 2017-07-31 | 4 | -16/+29 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Fix restore with convergence | Thomas Herve | 2017-06-15 | 4 | -16/+29 | |
| |/ / / / / | ||||||
* | | | | | | Merge "Don't load new copies of current resources" into stable/ocata8.0.3 | Jenkins | 2017-07-27 | 3 | -18/+39 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Don't load new copies of current resources | Zane Bitter | 2017-07-19 | 3 | -18/+39 | |
* | | | | | | | Merge "Filter out resources not in template when listing" into stable/ocata | Jenkins | 2017-07-27 | 2 | -6/+14 | |
|\ \ \ \ \ \ \ | |/ / / / / / | | | | / / / | |_|_|/ / / |/| | | | | | ||||||
| * | | | | | Filter out resources not in template when listing | rabi | 2017-07-05 | 2 | -6/+14 | |
| | |/ / / | |/| | | | ||||||
* | | | | | Get cancellation grace period correctly | huangtianhua | 2017-07-05 | 2 | -4/+4 | |
|/ / / / | ||||||
* | | | | Merge "Ignore property 'metadata' of OS::Heat::DeployedServer" into stable/ocata | Jenkins | 2017-07-04 | 2 | -6/+4 | |
|\ \ \ \ | ||||||
| * | | | | Ignore property 'metadata' of OS::Heat::DeployedServer | huangtianhua | 2017-06-09 | 2 | -6/+4 | |
* | | | | | Use correct user password as occ credential | huangtianhua | 2017-06-20 | 2 | -1/+58 | |
| |/ / / |/| | | | ||||||
* | | | | Merge "Fix handle_restore for server and volume resources" into stable/ocata | Jenkins | 2017-06-09 | 5 | -5/+91 | |
|\ \ \ \ | |/ / / |/| | | | ||||||
| * | | | Fix handle_restore for server and volume resources | rabi | 2017-05-25 | 5 | -5/+91 | |
* | | | | Merge "Deal correctly with negative elapsed time" into stable/ocata8.0.2 | Jenkins | 2017-06-05 | 2 | -1/+11 | |
|\ \ \ \ | ||||||
| * | | | | Deal correctly with negative elapsed time | Zane Bitter | 2017-05-17 | 2 | -1/+11 |