summaryrefslogtreecommitdiff
path: root/doc/administration
diff options
context:
space:
mode:
authorDrew Blessing <drew@gitlab.com>2016-06-01 14:46:07 -0500
committerDrew Blessing <drew@gitlab.com>2016-06-01 14:46:07 -0500
commitc1923aef04d63050376e14033a6a04a1e3ae0904 (patch)
tree44692314063a201598004a225abfdc42be220fb1 /doc/administration
parent91496a09656948e713910a05f1c49417b628c26c (diff)
downloadgitlab-ce-c1923aef04d63050376e14033a6a04a1e3ae0904.tar.gz
Explicitly mention advisory file locking
Diffstat (limited to 'doc/administration')
-rw-r--r--doc/administration/high_availability/nfs.md4
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/administration/high_availability/nfs.md b/doc/administration/high_availability/nfs.md
index 49ff5d536a1..537f4f3501d 100644
--- a/doc/administration/high_availability/nfs.md
+++ b/doc/administration/high_availability/nfs.md
@@ -2,8 +2,8 @@
## Required NFS Server features
-**File locking**: GitLab **requires** file locking which is only supported
-natively in NFS version 4. NFSv3 also supports locking as long as
+**File locking**: GitLab **requires** advisory file locking, which is only
+supported natively in NFS version 4. NFSv3 also supports locking as long as
Linux Kernel 2.6.5+ is used. We recommend using version 4 and do not
specifically test NFSv3.