From 8c80400b4a96fbb92e4155b3b17c0e8ef60e112c Mon Sep 17 00:00:00 2001
From: deajan <ozy@netpower.fr>
Date: Tue, 2 Aug 2016 11:11:19 +0200
Subject: [PATCH] Updated text files

---
 CHANGELOG.md | 12 ++++++++++++
 README.md    |  5 +++++
 2 files changed, 17 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2b4c50f..0ab6278 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,18 @@ KNOWN ISSUES
 RECENT CHANGES
 --------------
 
+- Improved execution speed
+	- Added parallel execution for most secondary fuctions
+	- Lowered sleep time in wait functions
+	- Removed trivial sleep and forking in remote deletion code, send the whole function to background instead
+- Improved WaitFor... functions to accept multiple pids
+- Improved logging
+
+XX Xxx 2016: osync v1.1.1 released
+
+- Fixed deletion propagation code
+- Fixed missing deletion / backup diretories message in verbose mode
+
 27 Jul 2016: osync v1.1 released
 - More msys and cygwin compatibility
 - Logging begins now before any remote checks
diff --git a/README.md b/README.md
index 6902b4c..09055b4 100644
--- a/README.md
+++ b/README.md
@@ -131,6 +131,11 @@ Systemd specific (one service per config file)
 	$ systemctl start osync-srv@configfile.conf
 	$ systemctl enable osync-srv@configfile.conf
 
+Contributions
+-------------
+Bug fixes and ideas are welcome. When submitting a PR, please be sure to modify dev/n_osync.sh & dev/ofunctions.sh instead of osync.sh which is overwritten on every commit.
+Consider reading CODING_STYLE.TXT before submitting a patch.
+
 Troubleshooting
 ---------------
 You may find osync's logs in /var/log/osync.*.log (or current directory if /var/log is not writable).