From a3e819109b98677639130a4cd0864acc71e519f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Bonhomme?= <cedric@cedricbonhomme.org>
Date: Thu, 1 Feb 2018 10:12:04 +0100
Subject: [PATCH] Version bump.

---
 CHANGELOG.md | 38 +++++++++++++++++++++++++++++++++++++-
 VERSION.json |  2 +-
 package.json |  2 +-
 3 files changed, 39 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2a31135..7d9c4af 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,42 @@
 MONARC Changelog
 ================
 
+## 2.2.0 (2018-02-01)
+
+### New
+
+- generate deliverable on 4th step of method (#51)
+- export all of risk analysis data (#28)
+
+### Enhancement
+
+- option of export tables in a csv file (#52)
+- show version MONARC on left panel (#50)
+- ensures new users (of the back office) are created with a level of
+  permissions (#48)
+- the back office displays the appropriate view based on the user permissions
+  (#48)
+- set the selected attribute for the search filter of models in the back office
+
+### Fix
+
+- user operational risk - tag (#55)
+- operational risk - tag (#54)
+- detach a tag from an asset (#53)
+- operational risk importation (#64)
+- various minor fixes in the back office (management of models)
+
+
+To update, check out our
+[update](http://monarc.lu/technical-guide/#monarc-update) instructions.
+
+This release includes a consequent changes in the database of the back office
+and in the synchronization process of the deliveries templates (between the
+back office and the different clients instances). If you are using a back
+office, be careful to also update your ansible playbook
+([instructions](http://monarc.lu/technical-guide/#update-monarc-when-connected-to-a-back-office)).
+
+
 ## 2.1.0 (2017-12-04)
 
 ### Enhancement
@@ -14,7 +50,7 @@ MONARC Changelog
 - added a condition to hide/show probability field on Threats assessment.
 - it is now possible to export a whole analysis (or an asset) in JSON or as an
   encrypted JSON file. Analysis exported with the legacy system can still be
-  imported in MONARC.
+  imported in MONARC (#47).
 - it is now mandatory to specify a level of permissions when creating a new
   user.
 
diff --git a/VERSION.json b/VERSION.json
index eb18b80..49da776 100644
--- a/VERSION.json
+++ b/VERSION.json
@@ -1 +1 @@
-{"major":2, "minor":1, "hotfix":0}
+{"major":2, "minor":2, "hotfix":0}
diff --git a/package.json b/package.json
index 41177aa..57007b4 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "MONARC",
-  "version": "2.1.0",
+  "version": "2.2.0",
   "description": "MONARC Frontoffice App",
   "private": true,
   "repository": {