diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-01-10 21:07:23 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-01-10 21:07:23 +0000 |
| commit | 99bd45e7ce7539f3a0b7f7b710f1230464367b59 (patch) | |
| tree | b5337e76c2a326b31c1890d154881ff68d388bc7 /config/feature_flags/ops | |
| parent | 8cc4a6f23d41a1c57dc309130d2ce9ebc04d8334 (diff) | |
| download | gitlab-ce-99bd45e7ce7539f3a0b7f7b710f1230464367b59.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config/feature_flags/ops')
| -rw-r--r-- | config/feature_flags/ops/enforce_memory_watchdog.yml | 2 | ||||
| -rw-r--r-- | config/feature_flags/ops/gitlab_memory_watchdog.yml | 8 |
2 files changed, 1 insertions, 9 deletions
diff --git a/config/feature_flags/ops/enforce_memory_watchdog.yml b/config/feature_flags/ops/enforce_memory_watchdog.yml index fae127564c9..ae0ab81f9f6 100644 --- a/config/feature_flags/ops/enforce_memory_watchdog.yml +++ b/config/feature_flags/ops/enforce_memory_watchdog.yml @@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/367534 milestone: '15.2' type: ops group: group::application performance -default_enabled: false +default_enabled: true diff --git a/config/feature_flags/ops/gitlab_memory_watchdog.yml b/config/feature_flags/ops/gitlab_memory_watchdog.yml deleted file mode 100644 index f4c9a489864..00000000000 --- a/config/feature_flags/ops/gitlab_memory_watchdog.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: gitlab_memory_watchdog -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/91910 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/367534 -milestone: '15.2' -type: ops -group: group::application performance -default_enabled: false |