upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-04-22 23:03:00 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 78

Merge pull request #17190 from owncloud/lock-changelabel

Browse source 
Rename experimental to transactional file locking
This commit is contained in:
Thomas Müller 2015-06-26 12:27:16 +02:00
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
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
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>