From 01888d1e587c681e80117d7457b0c643a0719a21 Mon Sep 17 00:00:00 2001
From: antirez <antirez@gmail.com>
Date: Thu, 4 Jun 2015 11:35:56 +0200
Subject: [PATCH] Redis 3.0.2

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

diff --git a/00-RELEASENOTES b/00-RELEASENOTES
index a32930a4..95f86e3a 100644
--- a/00-RELEASENOTES
+++ b/00-RELEASENOTES
@@ -10,6 +10,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 3.0.2 ] Release date: 4 Jun 2015
+
+Upgrade urgency: HIGH for Redis because of a security issue.
+                 LOW for Sentinel.
+
+* [FIX] Critical security issue fix by Ben Murphy: http://t.co/LpGTyZmfS7
+* [FIX] SMOVE reply fixed when src and dst keys are the same. (Glenn Nethercutt)
+* [FIX] Lua cmsgpack lib updated to support str8 type. (Sebastian Waisbrot)
+
+* [NEW] ZADD support for options: NX, XX, CH. See new doc at redis.io.
+        (Salvatore Sanfilippo)
+* [NEW] Senitnel: CKQUORUM and FLUSHCONFIG commands back ported.
+        (Salvatore Sanfilippo)
+
 --[ Redis 3.0.1 ] Release date: 5 May 2015
 
 Upgrade urgency: LOW for Redis and Cluster, MODERATE for Sentinel.
diff --git a/src/version.h b/src/version.h
index 44ac9c45..ee8c63ce 100644
--- a/src/version.h
+++ b/src/version.h
@@ -1 +1 @@
-#define REDIS_VERSION "3.0.1"
+#define REDIS_VERSION "3.0.2"