From c5cb0e7261218510d49df06c98a01eeff11e8bf9 Mon Sep 17 00:00:00 2001
From: gau1991 <gaurav.astikar@rtcamp.com>
Date: Thu, 7 May 2015 15:22:29 +0530
Subject: [PATCH] Dump version 3.1.4, updated changelog

---
 CHANGELOG.txt        | 3 +++
 ee/core/variables.py | 2 +-
 install              | 2 +-
 setup.py             | 2 +-
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 3839fd15..96fcf0d8 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,3 +1,6 @@
+v 3.1.4 - May 7, 2015
+- Fixed XSS Vulnerability found is some WordPress themes and plugins
+
 v 3.1.3 - May 6, 2015
 - EasyEngine now fixes missing GPG keys automatically, fixes #470
 - Fixed Nginx hash bucket issue, fixes #449
diff --git a/ee/core/variables.py b/ee/core/variables.py
index 62f78327..7c4cb57f 100644
--- a/ee/core/variables.py
+++ b/ee/core/variables.py
@@ -12,7 +12,7 @@ class EEVariables():
     """Intialization of core variables"""
 
     # EasyEngine version
-    ee_version = "3.1.3"
+    ee_version = "3.1.4"
 
     # EasyEngine packages versions
     ee_wp_cli = "0.19.0"
diff --git a/install b/install
index 0d1247e4..28cd6596 100644
--- a/install
+++ b/install
@@ -48,7 +48,7 @@ fi
 # Define variables for later use
 ee_branch=$1
 readonly ee_version_old="2.2.3"
-readonly ee_version_new="3.1.3"
+readonly ee_version_new="3.1.4"
 readonly ee_log_dir=/var/log/ee/
 readonly ee_install_log=/var/log/ee/install.log
 readonly ee_linux_distro=$(lsb_release -i | awk '{print $3}')
diff --git a/setup.py b/setup.py
index 43660d82..e79d3a23 100644
--- a/setup.py
+++ b/setup.py
@@ -54,7 +54,7 @@ except Exception as e:
     os.system("git config --global user.email {0}".format(ee_email))
 
 setup(name='ee',
-      version='3.1.3',
+      version='3.1.4',
       description=long_description,
       long_description=long_description,
       classifiers=[],