From e8a967d16f6eaeb9c7a9e06e266179434f61dbfa Mon Sep 17 00:00:00 2001
From: Ruflin <spam@ruflin.com>
Date: Mon, 10 Aug 2015 21:00:18 +0200
Subject: [PATCH] Update relase notes in CHANGELOG and update composer.json
 version

---
 CHANGELOG.md  | 12 +++++++++++-
 composer.json |  2 +-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index be53a96f60..4b93dd66cc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,12 +1,22 @@
 # Change Log
 All notable changes to this project will be documented in this file based on the [Keep a Changelog](http://keepachangelog.com/) Standard. This project adheres to [Semantic Versioning](http://semver.org/).
 
-## [Unreleased](https://github.com/ruflin/Elastica/compare/2.2.0...HEAD)
+## [Unreleased](https://github.com/ruflin/Elastica/compare/2.2.1...HEAD)
 
 ### Backward Compatibility Breaks
 
 ### Bugfixes
 
+### Added
+
+### Improvements
+
+### Deprecated
+
+
+## [2.2.1](https://github.com/ruflin/Elastica/releases/tag/2.2.1) - 2015-08-10
+
+
 ### Added
 - Support for index template added [#905](https://github.com/ruflin/Elastica/pull/905)
 
diff --git a/composer.json b/composer.json
index 8bffc3340d..69b6bdcbfb 100644
--- a/composer.json
+++ b/composer.json
@@ -37,7 +37,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "2.0.x-dev"
+            "dev-master": "2.2.x-dev"
         }
     }
 }