WMDE
/
osync
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Deprecat LOG_CONFLICTS as experimental feature

This commit is contained in:
deajan 2019-05-19 16:42:08 +02:00
parent 094d1538bb
commit 76d80b17f6
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dev/n_osync.sh
View File

@ -2755,7 +2755,7 @@ function Usage {
echo "--silent Will run osync without any output to stdout, used for cron jobs"
echo "--errors-only Output only errors (can be combined with silent or verbose)"
echo "--summary Outputs a list of transferred / deleted files at the end of the run"
echo "--log-conflicts Outputs a list of conflicted files"
echo "--log-conflicts [EXPERIMENTAL] Outputs a list of conflicted files"
echo "--alert-conflicts Send an email if conflictual files found (implies --log-conflicts)"
echo "--verbose Increases output"
echo "--stats Adds rsync transfer statistics to verbose output"

6
sync.conf.example
View File

@ -1,8 +1,8 @@
###### osync - Rsync based two way sync engine with fault tolerance
###### (C) 2013-2019 by Orsiris de Jong (www.netpower.fr)
###### osync v1.1x / v2.0x config file rev 2019020801
[GENERAL]
CONFIG_FILE_REVISION=1.3.0
## Sync job identification
INSTANCE_ID="sync_test"
@ -126,7 +126,7 @@ MAX_WAIT=7200
[BACKUP_DELETE_OPTIONS]
## Log a list of conflictual files
## Log a list of conflictual files (EXPERIMENTAL)
LOG_CONFLICTS=true
## Send an email when conflictual files are found (implies LOG_CONFLICTS)
ALERT_CONFLICTS=false
@ -203,4 +203,4 @@ MAX_EXEC_TIME_PER_CMD_AFTER=0
STOP_ON_CMD_ERROR=true
## Run local and remote after sync commands even on failure
RUN_AFTER_CMD_ON_ERROR=no
RUN_AFTER_CMD_ON_ERROR=false