From 8fbfae6a98a61a08aee92e2a8c7ef52f25962911 Mon Sep 17 00:00:00 2001
From: Julien Duponchelle <julien@duponchelle.info>
Date: Wed, 15 Jun 2016 18:51:31 +0200
Subject: [PATCH] 1.5.0rc2

---
 CHANGELOG             | 14 ++++++++++++++
 gns3server/version.py |  2 +-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index 059c85b7..9e50db48 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,19 @@
 # Change Log
 
+## 1.5.0rc2 15/06/2016
+
+* Fix black screen with Qt app in Docker container
+* Detect when command in the container exit
+* Docker when the aux console exit and restart it
+* Pass by default the environment variable container=docker
+* Fix busybox binary location
+* Avoid loosing console port for Docker
+* Workaround a crash in x11vnc
+* Delete volume when dropping the container
+* Catch connection reset in ioucon
+* Delete vlan.dat for L2IOL during config import. Fixes #1285.
+* Copy original ressources from VOLUMES
+
 ## 1.5.0rc1 01/06/2016
 
 * Save an restore docker permission
diff --git a/gns3server/version.py b/gns3server/version.py
index 68f0ba27..0c88633d 100644
--- a/gns3server/version.py
+++ b/gns3server/version.py
@@ -23,5 +23,5 @@
 # or negative for a release candidate or beta (after the base version
 # number has been incremented)
 
-__version__ = "1.5.0dev5"
+__version__ = "1.5.0rc2"
 __version_info__ = (1, 5, 0, -99)