Bump v1.1.2
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 34f2627..0dc7699 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 3.10)
project(kvrocks
- VERSION 1.1.1
+ VERSION 1.1.2
DESCRIPTION "NoSQL which based on rocksdb and compatible with the Redis protocol"
LANGUAGES CXX)
diff --git a/Changelog b/Changelog
index 3ff3491..5776eda 100644
--- a/Changelog
+++ b/Changelog
@@ -1,3 +1,8 @@
+* Version 1.1.2 (@2019-12-06)
+ - FIX: the replication auth should use the masterauth instead of requirepass
+ - FIX: keep retrying to restart the replication thread instead of give up
+ - MOD: disable the rocksdb pipelined write
+
* Version 1.1.1 (@2019-11-20)
- Feature: info show the used_db_size by namespace
- Feature: allow user's token to compact
diff --git a/kvrocks.conf b/kvrocks.conf
index c9da542..d2a3759 100644
--- a/kvrocks.conf
+++ b/kvrocks.conf
@@ -51,7 +51,7 @@
#
# requirepass foobared
-# If the master is password protected (using the "requirepass" configuration
+# If the master is password protected (using the "masterauth" configuration
# directive below) it is possible to tell the slave to authenticate before
# starting the replication synchronization process, otherwise the master will
# refuse the slave request.