Merge branch 'hotfix/v3.2.1'

CHANGELOG.txt

@@ -1,3 +1,6 @@
+v 3.2.1 - May 28, 2015
+- Fixed ee update branch issue
+
 v 3.2.0 - May 28, 2015
 - Now using openSuse builder to build Nginx package for both Ubuntu and Debian
 - Minor fixes and improvements

ee/core/variables.py

@@ -12,7 +12,7 @@ class EEVariables():
     """Intialization of core variables"""
 
     # EasyEngine version
-    ee_version = "3.2.0"
+    ee_version = "3.2.1"
 
     # EasyEngine packages versions
     ee_wp_cli = "0.19.1"

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.2.0"
+readonly ee_version_new="3.2.1"
 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}')
@@ -231,7 +231,7 @@ function ee_install()
     # Clone EE 3.0 Python ee_branch
     ee_lib_echo "Cloning EasyEngine, please wait..."
     if [ "$ee_branch" = "" ]; then
-        ee_branch=stable
+        ee_branch=master
     fi
 
     git clone -b $ee_branch https://github.com/rtCamp/easyengine.git /tmp/easyengine --quiet > /dev/null \

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.2.0',
+      version='3.2.1',
       description=long_description,
       long_description=long_description,
       classifiers=[],