From 65e79a8272d25114b3132ce3d79698b323496e0e Mon Sep 17 00:00:00 2001
From: antirez <antirez@gmail.com>
Date: Tue, 25 Jan 2011 10:21:13 +0100
Subject: [PATCH] release noted updated, version bumped to 2.1.12 (2.2.0 RC4)

---
 00-RELEASENOTES | 15 +++++++++++++++
 src/version.h   |  2 +-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/00-RELEASENOTES b/00-RELEASENOTES
index 1cae8684d795..28dcde087ad4 100644
--- a/00-RELEASENOTES
+++ b/00-RELEASENOTES
@@ -8,6 +8,21 @@ cases, basicaly it is very unlikely that you will experience any problem
 upgrading your 2.0 instances to 2.2, as 2.2 can work as a drop in replacement
 for 2.0.
 
+---------
+CHANGELOG
+---------
+
+What's new in Redis 2.1.10 (2.2 Release Candidate 4)
+====================================================
+
+Redis 2.2 RC4 is a bug fix and minor enhancement release:
+
+* Fixed timeout error in replication where master took a big time to BGSAVE.
+* Introduced explicit PING between master and slave, to reliably detect when
+  the link is down, even if the socket remains apparently connected.
+* Fixed compilation on FreeBSD.
+* Removed a small portability issue in redis-benchmark.
+
 What's new in Redis 2.1.10 (2.2 Release Candidate 3)
 ====================================================
 
diff --git a/src/version.h b/src/version.h
index 4e8d077592f2..3638f85c0c61 100644
--- a/src/version.h
+++ b/src/version.h
@@ -1 +1 @@
-#define REDIS_VERSION "2.1.11"
+#define REDIS_VERSION "2.1.12"