Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-07-20 12:55:51 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2021-07-20 12:55:51 +0300
commite8d2c2579383897a1dd7f9debd359abe8ae8373d (patch)
treec42be41678c2586d49a75cabce89322082698334 /config/feature_flags/ops
parentfc845b37ec3a90aaa719975f607740c22ba6a113 (diff)
Add latest changes from gitlab-org/gitlab@14-1-stable-eev14.1.0-rc42
Diffstat (limited to 'config/feature_flags/ops')
-rw-r--r--config/feature_flags/ops/ci_queueing_disaster_recovery_disable_fair_scheduling.yml8
-rw-r--r--config/feature_flags/ops/ci_queueing_disaster_recovery_disable_quota.yml (renamed from config/feature_flags/ops/ci_queueing_disaster_recovery.yml)2
-rw-r--r--config/feature_flags/ops/dedicated_redis_trace_chunks.yml8
3 files changed, 9 insertions, 9 deletions
diff --git a/config/feature_flags/ops/ci_queueing_disaster_recovery_disable_fair_scheduling.yml b/config/feature_flags/ops/ci_queueing_disaster_recovery_disable_fair_scheduling.yml
new file mode 100644
index 00000000000..65c1e0cfb53
--- /dev/null
+++ b/config/feature_flags/ops/ci_queueing_disaster_recovery_disable_fair_scheduling.yml
@@ -0,0 +1,8 @@
+---
+name: ci_queueing_disaster_recovery_disable_fair_scheduling
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56658
+rollout_issue_url:
+milestone: "13.12"
+type: ops
+group: group::pipeline execution
+default_enabled: false
diff --git a/config/feature_flags/ops/ci_queueing_disaster_recovery.yml b/config/feature_flags/ops/ci_queueing_disaster_recovery_disable_quota.yml
index 6a31c29ec1d..ebb55796aaa 100644
--- a/config/feature_flags/ops/ci_queueing_disaster_recovery.yml
+++ b/config/feature_flags/ops/ci_queueing_disaster_recovery_disable_quota.yml
@@ -1,5 +1,5 @@
---
-name: ci_queueing_disaster_recovery
+name: ci_queueing_disaster_recovery_disable_quota
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56658
rollout_issue_url:
milestone: "13.12"
diff --git a/config/feature_flags/ops/dedicated_redis_trace_chunks.yml b/config/feature_flags/ops/dedicated_redis_trace_chunks.yml
deleted file mode 100644
index 1f3da11dfd5..00000000000
--- a/config/feature_flags/ops/dedicated_redis_trace_chunks.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: dedicated_redis_trace_chunks
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/62938
-rollout_issue_url: https://gitlab.com/gitlab-com/gl-infra/scalability/-/issues/1096
-milestone: '14.0'
-type: ops
-group: team::Scalability
-default_enabled: false