diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-08-01 13:18:52 +0000 |
|---|---|---|
| committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-08-01 13:18:52 +0000 |
| commit | 5f742eb95a0080343167469ccabfeccd3630007d (patch) | |
| tree | 545b524f3ce17ce154238e87b393bef987a001df /app/services/clusters | |
| parent | 71384c590cda562ed0ccf62daee66cd69ea82f4f (diff) | |
| parent | bec319f894209044f31e3befac84238b6cad6eed (diff) | |
| download | gitlab-ce-5f742eb95a0080343167469ccabfeccd3630007d.tar.gz | |
Merge branch 'timeouted' into 'master'
correct error message on helm tiller installation timeout
See merge request gitlab-org/gitlab-ce!20683
Diffstat (limited to 'app/services/clusters')
| -rw-r--r-- | app/services/clusters/applications/check_installation_progress_service.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/services/clusters/applications/check_installation_progress_service.rb b/app/services/clusters/applications/check_installation_progress_service.rb index a1165b0ab28..35f5cff0e0c 100644 --- a/app/services/clusters/applications/check_installation_progress_service.rb +++ b/app/services/clusters/applications/check_installation_progress_service.rb @@ -35,7 +35,7 @@ module Clusters def check_timeout if timeouted? begin - app.make_errored!('Installation timeouted') + app.make_errored!('Installation timed out') ensure remove_installation_pod end |