diff options
| author | Achilleas Pipinellis <axil@gitlab.com> | 2019-08-14 07:13:57 +0000 |
|---|---|---|
| committer | Achilleas Pipinellis <axil@gitlab.com> | 2019-08-14 07:13:57 +0000 |
| commit | a9d18ba85832dacfd8c6edab3d704d7ae042c102 (patch) | |
| tree | 2b5792cc729c473253268cecbe5339f1e169534b | |
| parent | 4c4bd2c4ee69fa7a0d89aee7749589179c1ef600 (diff) | |
| parent | 5ebff84683361e6514d5d6d9e82ff60f495ec631 (diff) | |
| download | gitlab-ce-a9d18ba85832dacfd8c6edab3d704d7ae042c102.tar.gz | |
Merge branch 'fix-spelling-in-ci-runners-readme' into 'master'
Fix spelling of "timeouted" to "timed out"
See merge request gitlab-org/gitlab-ce!31774
| -rw-r--r-- | doc/ci/runners/README.md | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/ci/runners/README.md b/doc/ci/runners/README.md index c3678fc948e..8474d4ef66e 100644 --- a/doc/ci/runners/README.md +++ b/doc/ci/runners/README.md @@ -319,21 +319,21 @@ How this feature will work: 1. You set the _maximum job timeout_ for a Runner to 24 hours 1. You set the _CI/CD Timeout_ for a project to **2 hours** 1. You start a job -1. The job, if running longer, will be timeouted after **2 hours** +1. The job, if running longer, will be timed out after **2 hours** **Example 2 - Runner timeout not configured** 1. You remove the _maximum job timeout_ configuration from a Runner 1. You set the _CI/CD Timeout_ for a project to **2 hours** 1. You start a job -1. The job, if running longer, will be timeouted after **2 hours** +1. The job, if running longer, will be timed out after **2 hours** **Example 3 - Runner timeout smaller than project timeout** 1. You set the _maximum job timeout_ for a Runner to **30 minutes** 1. You set the _CI/CD Timeout_ for a project to 2 hours 1. You start a job -1. The job, if running longer, will be timeouted after **30 minutes** +1. The job, if running longer, will be timed out after **30 minutes** ### Be careful with sensitive information |