From 97ddfbbfc3b1f7710e4a60989cf22519d7e50181 Mon Sep 17 00:00:00 2001
From: antirez <antirez@gmail.com>
Date: Thu, 5 May 2011 15:54:49 +0200
Subject: [PATCH] Redis version 2.2.6

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

diff --git a/00-RELEASENOTES b/00-RELEASENOTES
index 59d8741c..145629bc 100644
--- a/00-RELEASENOTES
+++ b/00-RELEASENOTES
@@ -12,6 +12,15 @@ for 2.0.
 CHANGELOG
 ---------
 
+What's new in Redis 2.2.6
+=========================
+
+* Fixed bug #543. If you saw Redis instances crashing on List operations
+  (only happening with a non-default max entry size ziplist setting in
+  redis.conf) it was almost certainly this problem.
+* Fixed a bug with replication where SLAVEOF NO ONE caused a slave to close the
+  connection with all its slaves.
+
 What's new in Redis 2.2.5
 =========================
 
diff --git a/src/version.h b/src/version.h
index be662ce3..e48fe137 100644
--- a/src/version.h
+++ b/src/version.h
@@ -1 +1 @@
-#define REDIS_VERSION "2.2.5"
+#define REDIS_VERSION "2.2.6"