Changed build dates

CHANGELOG.md

@@ -27,7 +27,13 @@ UNDER WORK
 
 RECENT CHANGES
 --------------
- 
+
+- Merged various fixes from onovy (http://github.com/onovy) Thanks!
+	- Lowered sleep time between commands
+	- Check if master and slave directories are the same
+	- Check script parameters in osync.sh and osync-batch.sh
+	- Run sync after timeout in --on-changs mode when no changes are detected (helps propagate slave changes)
+		- This still would need a remote slave helper service that creates a file on the master for inotify 
 - Prevent debug mode to send alert emails
 - Fixed an infamous bug introduced with exclude pattern globbing preventing multiple exludes to be processed
 - Fixed an issue with empty RSYNC_EXCLUDE_FILES

osync-batch.sh

@@ -3,7 +3,7 @@
 PROGRAM="Osync-batch" # Batch program to run osync instances sequentially and rerun failed ones
 AUTHOR="(L) 2013-2014 by Orsiris \"Ozy\" de Jong"
 CONTACT="http://www.netpower.fr/osync - ozy@netpower.fr"
-PROGRAM_BUILD=2411201401
+PROGRAM_BUILD=3003201501
 
 ## Runs an osync instance for every conf file found
 ## If an instance fails, run it again if time permits

osync.sh

@@ -4,7 +4,7 @@ PROGRAM="Osync" # Rsync based two way sync engine with fault tolerance
 AUTHOR="(L) 2013-2015 by Orsiris \"Ozy\" de Jong"
 CONTACT="http://www.netpower.fr/osync - ozy@netpower.fr"
 PROGRAM_VERSION=0.99RC4
-PROGRAM_BUILD=2903201501
+PROGRAM_BUILD=3003201501
 
 ## type doesn't work on platforms other than linux (bash). If if doesn't work, always assume output is not a zero exitcode
 if ! type -p "$BASH" > /dev/null

sync.conf

@@ -2,7 +2,7 @@
 
 ###### Osync - Rsync based two way sync engine with fault tolerance
 ###### (L) 2013-2014 by Orsiris "Ozy" de Jong (www.netpower.fr)
-###### Config file rev 2611201401
+###### Config file rev 3003201501
 
 ## ---------- GENERAL OPTIONS