From 31b91e1ccb22586851a8c15b494bbc3e44e4bb46 Mon Sep 17 00:00:00 2001
From: Julien Duponchelle <julien@duponchelle.info>
Date: Fri, 7 Aug 2015 18:39:59 +0200
Subject: [PATCH] 1.4.0beta1

---
 CHANGELOG             | 8 ++++++++
 gns3server/version.py | 4 ++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index d480475f..e06fabb9 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,13 @@
 # Change Log
 
+## 1.4.0beta1 07/08/2015
+
+* Fix ram setting for Qemu
+* Explicit set qemu memory as MB
+* Turn off KVM for non x86 architectures
+* Send an error when vmware executable cannot be found on Linux. Fixes #288.
+* Support for CPUs setting for Qemu VMs.
+
 ## 1.4.0alpha4 04/08/2015
 
 * Quote command in qemu debug logs so you can copy/paste them
diff --git a/gns3server/version.py b/gns3server/version.py
index 4a538c8f..0fa3289c 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.4.0dev5"
-__version_info__ = (1, 4, 0, -99)
+__version__ = "1.4.0beta1"
+__version_info__ = (1, 4, 0, 5)