Skip to content

Commit c5fd238

Browse files
Suzanne Selhornbob-bit-academy
andcommitted
Merge branch 'BobBitAcademy-master-patch-59078' into 'master'
Update deprecated cgroups_memory_limit property in docs See merge request https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/6388 Merged-by: Suzanne Selhorn <[email protected]> Approved-by: Jason Plum <[email protected]> Co-authored-by: Bob van den Berge <[email protected]>
2 parents 6064112 + a03b836 commit c5fd238

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

doc/settings/memory_constrained_envs.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ gitaly['cgroups_count'] = 2
174174
gitaly['cgroups_mountpoint'] = '/sys/fs/cgroup'
175175
gitaly['cgroups_hierarchy_root'] = 'gitaly'
176176
gitaly['cgroups_memory_enabled'] = true
177-
gitaly['cgroups_memory_limit'] = 500000
177+
gitaly['cgroups_memory_bytes'] = 500000
178178
gitaly['cgroups_cpu_enabled'] = true
179179
gitaly['cgroups_cpu_shares'] = 512
180180

@@ -256,7 +256,7 @@ and disable the Prometheus Metrics feature:
256256
gitaly['cgroups_mountpoint'] = '/sys/fs/cgroup'
257257
gitaly['cgroups_hierarchy_root'] = 'gitaly'
258258
gitaly['cgroups_memory_enabled'] = true
259-
gitaly['cgroups_memory_limit'] = 500000
259+
gitaly['cgroups_memory_bytes'] = 500000
260260
gitaly['cgroups_cpu_enabled'] = true
261261
gitaly['cgroups_cpu_shares'] = 512
262262

0 commit comments

Comments
 (0)