From f2f2b4eb9d7d54aa815ac17e33b5254d527b1856 Mon Sep 17 00:00:00 2001
From: antirez <antirez@gmail.com>
Date: Thu, 20 Jun 2013 10:36:40 +0200
Subject: [PATCH] Redis 2.6.14

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

diff --git a/00-RELEASENOTES b/00-RELEASENOTES
index 09c098666..13ba9e8c4 100644
--- a/00-RELEASENOTES
+++ b/00-RELEASENOTES
@@ -14,6 +14,17 @@ 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.14 ] Release date: 20 Jun 2013
+
+UPGRADE URGENCY: HIGH because of the following two issues:
+    * Lua scripting + Replication + AOF in slaves problem (see Issue #1164).
+    * AOF + expires possible race condition (see Issue #1079).
+
+* [FIX] AOF bug: expire could be removed from key on AOF rewrite.
+* [FIX] Allow writes from scripts called by AOF loading in read-only slaves.
+* [FIX] Sentinel: parse new verison of INFO replication output correctly.
+* [NEW] Reset masterauth if an empty string is configured.
+
 --[ Redis 2.6.13 ]
 
 UPGRADE URGENCY: MODERATE, nothing very critical but upgrading is suggested
diff --git a/src/version.h b/src/version.h
index b6c3f1815..2872b9fe7 100644
--- a/src/version.h
+++ b/src/version.h
@@ -1 +1 @@
-#define REDIS_VERSION "2.6.13"
+#define REDIS_VERSION "2.6.14"