From 05db8749d4b08ecc33bc15782f8a6643c2dc5acc Mon Sep 17 00:00:00 2001
From: Thomas Darimont <tdarimont@gopivotal.com>
Date: Mon, 31 Mar 2014 13:12:48 +0200
Subject: [PATCH] DATAREDIS-292 - Prepare release 1.3.0 M1.

Update release notes, changelog and readme.

Original pull request: #61.
---
 README.md                   |  2 +-
 docs/src/info/changelog.txt | 33 +++++++++++++++++++++++++++++++++
 docs/src/info/readme.txt    |  4 ++--
 3 files changed, 36 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index f2a3fc2c0..6dd469cd9 100644
--- a/README.md
+++ b/README.md
@@ -54,7 +54,7 @@ dependencies {
 }
 ~~~~~
 
-Latest GA release is _1.2.0.RELEASE_  
+Latest GA release is _1.2.1.RELEASE_  
 Latest nightly is _1.3.0.BUILD-SNAPSHOT_
 
 # Usage (for the impatient)
diff --git a/docs/src/info/changelog.txt b/docs/src/info/changelog.txt
index 8d85afe08..7b9a0ca5b 100644
--- a/docs/src/info/changelog.txt
+++ b/docs/src/info/changelog.txt
@@ -5,6 +5,39 @@ http://projects.spring.io/spring-data-redis/
 Commit changelog: http://github.com/spring-projects/spring-data-redis/tree/v[version]
 Issues changelog: http://jira.springsource.org/secure/ReleaseNote.jspa?projectId=10604
 
+Changes in version 1.3.0.M1 (2014-03-31)
+----------------------------------------
+Fix
+  [DATAREDIS-283] - RedisCacheManager.loadCaches overrides already defined cache names in afterPropertiesSet().
+  [DATAREDIS-285] - LettuceTemplate.execute should read and convert entire response.
+  [DATAREDIS-286] - Avoid potential RedisTemplate.expire() overflow.
+  [DATAREDIS-289] - Avoid NPE in append() in case of pipelining or/and multi/exec calls.
+Improvement
+  [DATAREDIS-184] - Support Redis 2.6 SAVE/NOSAVE arguments to shutdown command.
+  [DATAREDIS-284] - Add support for zCard to ZSetOperations.
+  [DATAREDIS-287] - setBit() should return a Boolean.
+New Feature
+  [DATAREDIS-267] - Add support for CLIENT KILL.
+  [DATAREDIS-268] - Add support for CLIENT LIST.
+  [DATAREDIS-269] - Add support for CLIENT SETNAME.
+  [DATAREDIS-270] - Add support for CLIENT GETNAME.
+  [DATAREDIS-271] - Add support for PSETEX.
+  [DATAREDIS-277] - Add support for SLAVEOF.
+Task
+  [DATAREDIS-261] - Upgrade commons-pool to commons-pool2.
+  [DATAREDIS-275] - Rename RedisServerCommands.bgWriteAof to bgReWriteAof.
+  [DATAREDIS-292] - Release 1.3.0 M1.
+  
+Changes in version 1.2.1.GA (2014-03-27)
+----------------------------------------
+Fix
+  [DATAREDIS-283] - RedisCacheManager.loadCaches overrides already defined cache names in afterPropertiesSet().
+  [DATAREDIS-285] - LettuceConnection.execute should fully read response.
+  [DATAREDIS-286] - Avoid overflow in JedisConnection#expire / #pexpire.
+  [DATAREDIS-289] - Avoid NPE in DefaultValueOperations#append() in case of pipelining or/and multi/exec calls.
+Task
+  [DATAREDIS-291] - Release Version 1.2.1.
+
 Changes in version 1.2.0.GA (2014-03-03)
 ----------------------------------------
 Task
diff --git a/docs/src/info/readme.txt b/docs/src/info/readme.txt
index 8b09a8aba..4d41a4a11 100644
--- a/docs/src/info/readme.txt
+++ b/docs/src/info/readme.txt
@@ -1,5 +1,5 @@
-SPRING DATA REDIS $version (March 3, 2014)
-------------------------------------------
+SPRING DATA REDIS $version (March 31, 2014)
+-------------------------------------------
 http://projects.spring.io/spring-data-redis/
 
 1. INTRODUCTION