From c2280541c6035fd36ed48bb7a20edae09be3e84b Mon Sep 17 00:00:00 2001
From: Daniel Gerhardt <code@dgerhardt.net>
Date: Tue, 10 Feb 2015 19:07:19 +0100
Subject: [PATCH] Release version 2.1.0

---
 CHANGELOG.md | 22 ++++++++++++++++++++++
 pom.xml      |  2 +-
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 640e3a0c2..0e5cf98e7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,27 @@
 # Changelog
 
+## 2.1
+Major features:
+* Public Pool (experimental): It is now possible to share sessions with other
+  users in a pool of public sessions. Other users can create their own copies of
+  shared sessions. This feature can be enabled in the arsnova.properties
+  configuration.
+
+Minor features and changes:
+* Adjustments to correctly handle requests for imports from the frontend.
+* Some communication between the frontend and backend has been optimized for
+  improved performance.
+* Additional configuration parameters for tracking, session export and import, a
+  demo session and a blog URL have been introduced.
+
+**This version is brought to you by:**  
+Project management: Klaus Quibeldey-Cirkel  
+Lead programming: Andreas Gärtner, Daniel Gerhardt, Christoph Thelen  
+Contributions: Felix Schmidt, Artjom Siebert, Daniel Vogel  
+Sponsoring: [AG QLS](https://www.thm.de/zqe/qmnetzwerk/agqls),
+[HMWK](https://wissenschaft.hessen.de/wissenschaft/it-neue-medien/kompetenznetz-e-learning-hessen)  
+
+
 ## 2.0.2
 This release updates dependencies. The updated library for Socket.IO support
 fixes memory leaks and disables SSL 3.0 support (POODLE vulnerability).
diff --git a/pom.xml b/pom.xml
index 44653b20c..404a5adb7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>de.thm.arsnova</groupId>
 	<artifactId>arsnova-backend</artifactId>
-	<version>2.1.0-SNAPSHOT</version>
+	<version>2.1.0</version>
 	<packaging>war</packaging>
 
 	<properties>
-- 
GitLab