From 76d80b17f6abbe4e2cd985a19b8635913b4ef8a9 Mon Sep 17 00:00:00 2001 From: deajan Date: Sun, 19 May 2019 16:42:08 +0200 Subject: [PATCH] Deprecat LOG_CONFLICTS as experimental feature --- dev/n_osync.sh | 2 +- sync.conf.example | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dev/n_osync.sh b/dev/n_osync.sh index 0fa165a..d487630 100644 --- a/dev/n_osync.sh +++ b/dev/n_osync.sh @@ -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" diff --git a/sync.conf.example b/sync.conf.example index 1abeef0..24e672e 100644 --- a/sync.conf.example +++ b/sync.conf.example @@ -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