summaryrefslogtreecommitdiffstats
path: root/modules-available
diff options
context:
space:
mode:
authorSimon Rettberg2017-06-02 12:04:24 +0200
committerSimon Rettberg2017-06-02 12:04:24 +0200
commitddfce0d0b2423867e8dbd6523e6525c6a7abccde (patch)
tree0b8f635d8863fe69146a3f6a1708bcdf26152ed6 /modules-available
parent[statistics] Remove debug message (diff)
parent[vmstore] Fix broken NFS example config (diff)
downloadslx-admin-ddfce0d0b2423867e8dbd6523e6525c6a7abccde.tar.gz
slx-admin-ddfce0d0b2423867e8dbd6523e6525c6a7abccde.tar.xz
slx-admin-ddfce0d0b2423867e8dbd6523e6525c6a7abccde.zip
Merge remote-tracking branch 'origin/location-info-panel'
Diffstat (limited to 'modules-available')
-rw-r--r--modules-available/vmstore/templates/page-vmstore.html6
1 files changed, 3 insertions, 3 deletions
diff --git a/modules-available/vmstore/templates/page-vmstore.html b/modules-available/vmstore/templates/page-vmstore.html
index adf87348..c1ab2472 100644
--- a/modules-available/vmstore/templates/page-vmstore.html
+++ b/modules-available/vmstore/templates/page-vmstore.html
@@ -95,14 +95,14 @@
</p>
<pre>
/mnt/images 1.2.3.4(rw,no_root_squash,async)
-/mnt/images *(ro,async,nolock)
+/mnt/images *(ro,async)
</pre>
<p>
{{lang_nfsHelp2}}
</p>
<pre>
-/mnt/images 1.2.3.4(rw,all_squash,anon_uid=1234,async)
-/mnt/images *(ro,async,nolock)
+/mnt/images 1.2.3.4(rw,all_squash,anonuid=1234,async)
+/mnt/images *(ro,async)
</pre>
</div>
<div class="modal-footer"><a class="btn btn-primary" data-dismiss="modal">{{lang_close}}</a></div>