Merge branch 'develop' into version/0.6.1version/0.6.1

Conflicts:
	Gemfile.lock

1 files changed, 18 insertions, 0 deletions

diff --git a/README.md b/README.md
index 665efa4..bf7fb27 100644
--- a/README.md
+++ b/README.md
@@ -101,6 +101,24 @@ the deamon wrapper. You can do this like this:
 
     ruby -I lib lib/tapicero.rb
 
+Changes
+--------------------
+
+0.6.1
+
+UPGRADING: the config option 'seq_file' is no long used, now 'seq_dir' is used
+(defaults to "/var/run/tapicero").
+
+* prevent username and password from leaking in processlist
+* support for tmp_users database
+
+0.6.0
+
+* do not log error if the db or design doc already exists
+  (since another tapicero instance probably created it)
+* pid now created successfully on server boot
+* don't die when couchdb is restarted
+
 License
 --------------------