From 49c385346211a2cf992d9d8f8309a39c4946ec79 Mon Sep 17 00:00:00 2001
From: Oliver Gierke <ogierke@pivotal.io>
Date: Mon, 1 Dec 2014 11:33:20 +0100
Subject: [PATCH] DATAES-134 - Updated changelog.

---
 src/main/resources/changelog.txt | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/main/resources/changelog.txt b/src/main/resources/changelog.txt
index 66ec9d580..e646004cb 100644
--- a/src/main/resources/changelog.txt
+++ b/src/main/resources/changelog.txt
@@ -1,6 +1,13 @@
 Spring Data Elasticsearch Changelog
 ===================================
 
+Changes in version 1.2.0.M1 (2014-12-01)
+----------------------------------------
+* DATAES-134 - Release 1.2 M1.
+* DATAES-94 - Support for Elasticsearch 1.2.0.
+* DATAES-76 - Add support for mapping generation of inherited fields.
+
+
 Changes in version 1.1.1.RELEASE (2014-10-30)
 ---------------------------------------------
 * DATAES-133 - Release 1.1.1.