summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge "Deal correctly with negative elapsed time" into stable/ocata8.0.2Jenkins2017-06-052-1/+11
|\
| * Deal correctly with negative elapsed timeZane Bitter2017-05-172-1/+11
* | Merge "Updated from global requirements" into stable/ocataJenkins2017-06-011-1/+1
|\ \
| * | Updated from global requirementsOpenStack Proposal Bot2017-05-301-1/+1
* | | Merge "Use six.text_type() instead of str() to serialise status" into stable/...Jenkins2017-06-013-6/+6
|\ \ \
| * | | Use six.text_type() instead of str() to serialise statusZane Bitter2017-05-313-6/+6
| |/ /
* | | Merge "Only recreate CHECK FAILED resources in ResourceGroup" into stable/ocataJenkins2017-05-312-10/+48
|\ \ \
| * | | Only recreate CHECK FAILED resources in ResourceGroupJason Dunsmore2017-04-042-10/+48
* | | | Merge "Disable ec2 collector for deployed-server" into stable/ocataJenkins2017-05-313-8/+10
|\ \ \ \ | |_|/ / |/| | |
| * | | Disable ec2 collector for deployed-serverJames Slagle2017-03-303-8/+10
* | | | Merge "Delete internal ports when detach them" into stable/ocataJenkins2017-05-242-47/+35
|\ \ \ \
| * | | | Delete internal ports when detach themhuangtianhua2017-04-062-47/+35
| | |/ / | |/| |
* | | | Merge "Set COMPLETE for failed resource if no update/replace" into stable/ocataJenkins2017-05-242-0/+22
|\ \ \ \
| * | | | Set COMPLETE for failed resource if no update/replacehuangtianhua2017-05-032-0/+22
* | | | | Merge "Corrected max secs for concurrent trans retries" into stable/ocataJenkins2017-05-193-16/+22
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Corrected max secs for concurrent trans retriesZane Bitter2017-05-123-16/+22
* | | | | Copy template version when update failsThomas Herve2017-05-152-0/+53
|/ / / /
* | | | Merge "Fix arguments for OS::Mistral::CronTrigger create" into stable/ocataJenkins2017-05-112-10/+12
|\ \ \ \ | |/ / / |/| | |
| * | | Fix arguments for OS::Mistral::CronTrigger createZane Bitter2017-04-282-10/+12
* | | | Imported Translations from ZanataOpenStack Proposal Bot2017-04-2410-557/+116
|/ / /
* | | Store project_domain in project_domain_idThomas Herve2017-04-101-2/+2
|/ /
* | Merge "To reset metadata for resources when mark healthy" into stable/ocata8.0.1Jenkins2017-04-033-3/+14
|\ \ | |/ |/|
| * To reset metadata for resources when mark healthyhuangtianhua2017-03-243-3/+14
* | Merge "Catch Unauthorized in delete_trust()" into stable/ocataJenkins2017-03-303-23/+19
|\ \
| * | Catch Unauthorized in delete_trust()huangtianhua2017-03-203-23/+19
| |/
* | Merge "Stop showing json deserialized message in log" into stable/ocataJenkins2017-03-221-1/+5
|\ \
| * | Stop showing json deserialized message in logricolin2017-03-071-1/+5
* | | Merge "Pass on outputs errors to parent stacks" into stable/ocataJenkins2017-03-213-8/+20
|\ \ \
| * | | Pass on outputs errors to parent stacksZane Bitter2017-03-163-8/+20
* | | | Merge "Updated from global requirements" into stable/ocataJenkins2017-03-211-1/+1
|\ \ \ \
| * | | | Updated from global requirementsOpenStack Proposal Bot2017-03-211-1/+1
* | | | | Merge "Still wait for hooks on failed resources" into stable/ocataJenkins2017-03-211-1/+1
|\ \ \ \ \
| * | | | | Still wait for hooks on failed resourcesZane Bitter2017-03-061-1/+1
* | | | | | Merge "Store user_domain in self._user_domain_id" into stable/ocataJenkins2017-03-211-2/+2
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Store user_domain in self._user_domain_idSteve Baker2017-03-081-2/+2
| | |_|/ / | |/| | |
* | | | | Merge "Reduce wait condition signal number" into stable/ocataJenkins2017-03-211-1/+1
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Reduce wait condition signal numberRico Lin2017-03-161-1/+1
| |/ / /
* | | | Sleep between check_resource callsThomas Herve2017-03-148-3/+25
|/ / /
* | | Try to fix local.conf creation in testsThomas Herve2017-02-241-5/+5
|/ /
* | Merge "Use region_name when creating keystone client" into stable/ocata8.0.0.0rc28.0.0Jenkins2017-02-162-5/+14
|\ \
| * | Use region_name when creating keystone clientrabi2017-02-072-5/+14
| |/
* | Merge "Add CEPHFS manila share protocol" into stable/ocataJenkins2017-02-152-1/+6
|\ \
| * | Add CEPHFS manila share protocolJan Provaznik2017-02-142-1/+6
* | | Merge "Just to migrate existing resource to backup stack" into stable/ocataJenkins2017-02-1511-144/+111
|\ \ \ | |/ / |/| |
| * | Just to migrate existing resource to backup stackhuangtianhua2017-02-1011-144/+111
| |/
* | Prepare for using standard python testsAndreas Jaeger2017-02-042-0/+60
|/
* Update UPPER_CONSTRAINTS_FILE for stable/ocataOpenStack Release Bot2017-02-021-1/+1
* Update .gitreview for stable/ocataOpenStack Release Bot2017-02-021-0/+1
* Merge "Fix restore_prev_rsrc assert weakref"8.0.0.0rc1Jenkins2017-02-022-3/+5
|\
| * Fix restore_prev_rsrc assert weakrefPeter Razumovsky2017-02-022-3/+5