From e108a9e136cff67fe24f3aa60d8f39c77f8372a0 Mon Sep 17 00:00:00 2001
From: Julien Duponchelle <julien@duponchelle.info>
Date: Tue, 10 May 2016 17:58:11 +0200
Subject: [PATCH 1/3] Prepare alpha 1

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

diff --git a/CHANGELOG b/CHANGELOG
index d99410fb..64feb186 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,11 @@
 # Change Log
 
+## 1.5.0a1 10/05/2016
+
+* Rebase the qcow2 when starting the VM if needed
+* Docker support
+* Import / Export topologies
+
 ## 1.4.6 28/04/2016
 
 * More robust save/restore for VirtualBox linked clone VM hard disks.
diff --git a/gns3server/version.py b/gns3server/version.py
index 8ed6cebe..f4cac907 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.0dev2"
+__version__ = "1.5.0a1"
 __version_info__ = (1, 5, 0, -99)

From ab13f628f744dd780e2ec0025515532f5dbe560b Mon Sep 17 00:00:00 2001
From: grossmj <grossmj@gns3.net>
Date: Tue, 10 May 2016 10:10:56 -0600
Subject: [PATCH 2/3] Minor changes on CHANGELOG

---
 CHANGELOG | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 64feb186..a821d33b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,9 +2,9 @@
 
 ## 1.5.0a1 10/05/2016
 
-* Rebase the qcow2 when starting the VM if needed
+* Rebase Qcow2 disks when starting a VM if needed
 * Docker support
-* Import / Export topologies
+* import / export portable projects (.gns3project)
 
 ## 1.4.6 28/04/2016
 
@@ -63,7 +63,7 @@
 * Fix error when setting Qemu VM boot to 'cd' (HDD or CD/DVD-ROM)
 * Fixed the VMware default VM location on Windows, so that it doesn't assume the "Documents" folder is within the %USERPROFILE% folder, and also support Windows Server's folder (which is "My Virtual Machines" instead of "Virtual Machines").
 * Improve dynamips startup_config dump
-* Dump environnement to server debug log
+* Dump environment to server debug log
 * Fix usage of qemu 0.10 on Windows
 * Show hostname when the hostname is missing in the iourc.txt
 

From 366e9620dcaac61a16eac8f8f33ce4e0747c08ea Mon Sep 17 00:00:00 2001
From: Julien Duponchelle <julien@duponchelle.info>
Date: Tue, 10 May 2016 19:09:15 +0200
Subject: [PATCH 3/3] Prepare 1.5.0 alpha 2

---
 CHANGELOG             | 4 ++++
 MANIFEST.in           | 1 +
 gns3server/version.py | 2 +-
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index a821d33b..b68a6d48 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,9 @@
 # Change Log
 
+## 1.5.0a2 10/05/2016
+
+* Fix distribution on PyPi
+
 ## 1.5.0a1 10/05/2016
 
 * Rebase Qcow2 disks when starting a VM if needed
diff --git a/MANIFEST.in b/MANIFEST.in
index ff327eea..61bdd940 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -4,6 +4,7 @@ include INSTALL
 include LICENSE
 include MANIFEST.in
 include tox.ini
+include requirements.txt
 recursive-include tests *
 recursive-exclude docs *
 recursive-include gns3server *
diff --git a/gns3server/version.py b/gns3server/version.py
index f4cac907..e0297eea 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.0a1"
+__version__ = "1.5.0a2"
 __version_info__ = (1, 5, 0, -99)