Skip to content
Snippets Groups Projects
Commit f82fcee8 authored by Suzanne Selhorn's avatar Suzanne Selhorn
Browse files

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: default avatarSuzanne Selhorn <sselhorn@gitlab.com>
Approved-by: default avatarJason Plum <jplum@gitlab.com>
Co-authored-by: default avatarBob van den Berge <bob@bit-academy.nl>
parents 1461f2f4 a971bb58
No related branches found
No related tags found
1 merge request!85Merged upstream 15.5.0+rc42.ce.0
......@@ -174,7 +174,7 @@
gitaly['cgroups_mountpoint'] = '/sys/fs/cgroup'
gitaly['cgroups_hierarchy_root'] = 'gitaly'
gitaly['cgroups_memory_enabled'] = true
gitaly['cgroups_memory_limit'] = 500000
gitaly['cgroups_memory_bytes'] = 500000
gitaly['cgroups_cpu_enabled'] = true
gitaly['cgroups_cpu_shares'] = 512
......@@ -256,7 +256,7 @@
gitaly['cgroups_mountpoint'] = '/sys/fs/cgroup'
gitaly['cgroups_hierarchy_root'] = 'gitaly'
gitaly['cgroups_memory_enabled'] = true
gitaly['cgroups_memory_limit'] = 500000
gitaly['cgroups_memory_bytes'] = 500000
gitaly['cgroups_cpu_enabled'] = true
gitaly['cgroups_cpu_shares'] = 512
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment