From c2054e3abb7ab6e44d8deb7b96c310ccd5aa14cc Mon Sep 17 00:00:00 2001
From: To-om <toom@thehive-project.org>
Date: Fri, 12 May 2017 11:41:31 +0200
Subject: [PATCH] Update version and changelog

---
 CHANGELOG.md | 18 ++++++++++++++++--
 version.sbt  |  2 +-
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 503c8d8c0..66c904f35 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,21 @@
 # Change Log
 
-## [1.0.2](https://github.com/CERT-BDF/Cortex/tree/1.0.2) (2017-04-18)
+## [1.1.0](https://github.com/CERT-BDF/Cortex/tree/1.1.0) (2017-05-12)
 
+[Full Changelog](https://github.com/CERT-BDF/Cortex/compare/1.0.2...1.1.0)
+
+**Implemented enhancements:**
+
+- Packaging [\#20](https://github.com/CERT-BDF/Cortex/issues/20)
+- Display analyzers metadata [\#18](https://github.com/CERT-BDF/Cortex/issues/18)
+- MISP integration feature request [\#21](https://github.com/CERT-BDF/Cortex/issues/21)
+
+**Closed issues:**
+
+- Display Cortex version on the footer [\#23](https://github.com/CERT-BDF/Cortex/issues/23)
+- Use new logo and favicon [\#22](https://github.com/CERT-BDF/Cortex/issues/22)
+
+## [1.0.2](https://github.com/CERT-BDF/Cortex/tree/1.0.2) (2017-04-19)
 [Full Changelog](https://github.com/CERT-BDF/Cortex/compare/1.0.1...1.0.2)
 
 **Fixed bugs:**
@@ -29,4 +43,4 @@
 ## [1.0.0](https://github.com/CERT-BDF/Cortex/tree/1.0.0) (2017-02-01)
 
 
-\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*
+\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*
\ No newline at end of file
diff --git a/version.sbt b/version.sbt
index 11475a2c5..48af491ec 100644
--- a/version.sbt
+++ b/version.sbt
@@ -1 +1 @@
-version in ThisBuild := "1.0.2"
+version in ThisBuild := "1.1.0"