From f962f86f30a112e0e28e5c990a0a49096748a0d4 Mon Sep 17 00:00:00 2001 From: deajan Date: Tue, 30 May 2017 10:09:19 +0200 Subject: [PATCH 1/2] Updated changelog --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 030937b..bd69b24 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,15 @@ RECENT CHANGES -------------- +dd Mmm YYYY: osync v1.2.2. release + +! Added an option to log conflictual files +! Presence of conflictual files can trigger a special mail +! new option FORCE_CONFLICT_PREVALANCE + dd Mmm YYYY: osync v1.2.1 release +- Fixed missing options passed to subprocess in daemon mode - Fixed bogus pgrep can lead to segfault 11 because of recursive KillChilds - Fixed osync deletion not working on systems with ssh banner enabled - Added basic performance profiler to debug version From 520c20659ff2b541c5d2bae095f47563daa64ed1 Mon Sep 17 00:00:00 2001 From: deajan Date: Tue, 30 May 2017 10:12:28 +0200 Subject: [PATCH 2/2] Added missing options to subprocess in daemon mode --- dev/n_osync.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dev/n_osync.sh b/dev/n_osync.sh index 70c5746..1a6f046 100755 --- a/dev/n_osync.sh +++ b/dev/n_osync.sh @@ -4,7 +4,7 @@ PROGRAM="osync" # Rsync based two way sync engine with fault tolerance AUTHOR="(C) 2013-2017 by Orsiris de Jong" CONTACT="http://www.netpower.fr/osync - ozy@netpower.fr" PROGRAM_VERSION=1.2.1-rc1 -PROGRAM_BUILD=2017053010 +PROGRAM_BUILD=2017053002 IS_STABLE=yes ##### Execution order #__WITH_PARANOIA_DEBUG @@ -2247,12 +2247,15 @@ for i in "$@"; do _NOLOCKS=true ;; --errors-only) + opts=$opts" --errors-only" _LOGGER_ERR_ONLY=true ;; --summary) + opts=$opts" --summary" _SUMMARY=true ;; --no-prefix) + opts=$opts" --no-prefix" _LOGGER_PREFIX="" ;; --destination-mails=*)