From 21159d53f58b01dfcd5e2451b617da0f3645aedb Mon Sep 17 00:00:00 2001
From: antirez <antirez@gmail.com>
Date: Wed, 16 Jan 2013 19:54:56 +0100
Subject: [PATCH] Redis 2.6.9

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

diff --git a/00-RELEASENOTES b/00-RELEASENOTES
index 5471baa3..2c501066 100644
--- a/00-RELEASENOTES
+++ b/00-RELEASENOTES
@@ -14,6 +14,20 @@ HIGH:     There is a critical bug that may affect a subset of users. Upgrade!
 CRITICAL: There is a critical bug affecting MOST USERS. Upgrade ASAP.
 --------------------------------------------------------------------------------
 
+--[ Redis 2.6.9 ]
+
+UPGRADE URGENCY: MODERATE if you use replication.
+
+* [BUGFIX]   Changing master at runtime (SLAVEOF command) in presence of
+             network problems, or in very rapid succession, could result
+             in non-critical problems (GitHub Issue #828).
+* [IMPROVED] CLINGET GETNAME and SETNAME to set and query connection names
+             reported by CLIENT LIST. Very useful for debugging of
+             problems.
+* [IMPROVED] redis-cli is now able to transfer an RDB file from a remote
+             server to a local file using the --rdb <filename> command
+             line option.
+
 --[ Redis 2.6.8 ]
 
 UPGRADE URGENCY: MODERATE if you use Lua scripting. Otherwise LOW.
diff --git a/src/version.h b/src/version.h
index c0881950..293bd1bf 100644
--- a/src/version.h
+++ b/src/version.h
@@ -1 +1 @@
-#define REDIS_VERSION "2.6.8"
+#define REDIS_VERSION "2.6.9"