From 6ab01cd2d9dbe62c1735a1702370293b9b6ba154 Mon Sep 17 00:00:00 2001
From: Damian Mooyman <damian@silverstripe.com>
Date: Wed, 18 Nov 2015 15:27:55 +1300
Subject: [PATCH] Add changelog for 2.2.0

---
 CHANGELOG.md  | 23 +++++++++++++++++++++++
 README.md     |  2 ++
 composer.json |  2 +-
 3 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100644 CHANGELOG.md

diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 0000000..07a608c
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,23 @@
+# Changelog
+
+All notable changes to this project will be documented in this file.
+
+This project adheres to [Semantic Versioning](http://semver.org/).
+
+## [2.2.0]
+
+* Changelog added.
+* Default PublishDate to NULL for drafts and sort them at the top
+* FIX Avoid feeding null to PaginatedList constructor
+* FIX Explicitly set the PostsPerPage during migration
+* ENHANCEMENT filtering for large user base sites.
+* BUG Fix crash if parent page isn't Blog type
+* BUGFIX: Dropdowns do not use unique IDs
+* ENHANCEMENT Default archive year
+* BUG Fix tag / category filters not being filtered in PaginatedList()
+* FIX Hardcode the year to the current year in setUp()
+* FIX Title bug due to [#320](https://github.com/silverstripe/silverstripe-blog/pull/320)
+* Added featured posts to CMS
+* Added hook for extension filters on category blog posts
+* Update translations
+* Added hook for extension filters on tag blog posts
diff --git a/README.md b/README.md
index d83d9af..bd7ee11 100755
--- a/README.md
+++ b/README.md
@@ -2,6 +2,8 @@
 
 [![Build Status](https://travis-ci.org/silverstripe/silverstripe-blog.png?branch=master)](https://travis-ci.org/silverstripe/silverstripe-blog) [![Latest Stable Version](https://poser.pugx.org/silverstripe/blog/v/stable.svg)](https://packagist.org/packages/silverstripe/blog) [![Total Downloads](https://poser.pugx.org/silverstripe/blog/downloads.svg)](https://packagist.org/packages/silverstripe/blog) [![Latest Unstable Version](https://poser.pugx.org/silverstripe/blog/v/unstable.svg)](https://packagist.org/silverstripe/silverstripe/blog) [![License](https://poser.pugx.org/silverstripe/blog/license.svg)](https://packagist.org/packages/silverstripe/blog)
 
+[Changelog](CHANGELOG.md)
+
 ## Features
 
 * [User roles](docs/en/roles.md)
diff --git a/composer.json b/composer.json
index d2f0015..c32cccf 100755
--- a/composer.json
+++ b/composer.json
@@ -17,7 +17,7 @@
 	},
 	"extra": {
 		"branch-alias": {
-			"dev-master": "2.0.x-dev"
+			"dev-master": "2.x-dev"
 		}
 	},
 	"license": "BSD-2-Clause",