sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #17190 from owncloud/lock-changelabel 

Rename experimental to transactional file locking
remotes/origin/enc_quick_fix_8.1
Thomas Müller 2015-06-26 12:27:16 +07:00
parent 6c3a4282e5 eadf789519
commit 8cc88fa64f
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
config/config.sample.php
Unescape Escape View File

@ -1025,14 +1025,14 @@ $CONFIG = array(
/**
* Enables the EXPERIMENTAL file locking.
* This is disabled by default as it is experimental.
* Enables transactional file locking.
* This is disabled by default as it is still beta.
*
* Prevents concurrent processes to access the same files
* at the same time. Can help prevent side effects that would
* be caused by concurrent operations.
*
* WARNING: EXPERIMENTAL
* WARNING: BETA quality
*/
'filelocking.enabled' => false,

4
settings/templates/admin.php
Unescape Escape View File

@ -533,9 +533,9 @@ if ($_['cronErrors']) {
<ul>
<li>
<?php if ($_['fileLockingEnabled']) {
p($l->t('Experimental File Lock is enabled.'));
p($l->t('Transactional File Locking is enabled.'));
} else {
p($l->t('Experimental File Lock is disabled.'));
p($l->t('Transactional File Locking is disabled.'));
} ?>
</li>
</ul>