Merge tag 'v3.2.2' into develop

Merge Branch hotfix v3.2.2

CHANGELOG.txt

@@ -1,4 +1,7 @@
-v 3.2.1 - Jun 19, 205
+v 3.2.2 - Jun 19, 2015
+- Fixed bug that was preventing disabling debug
+
+v 3.2.1 - Jun 19, 2015
 - Improved experimental HHVM and Pagespeed handling, fixes #564, #562
 - Fixed missing link for Proxy sites #571
 - Added hhvm.server.ip for HHVM config #567

ee/cli/plugins/debug.py

@@ -224,10 +224,9 @@ class EEDebugController(CementBaseController):
                     hhvmconf=True
                 else:
                     hhvmconf=False
-                data = dict(php="9001", debug="9001", hhvm="9001",
-                            hhvmconf=hhvmcof)
+                data = dict(php="9000", debug="9001", hhvm="8000",
+                            hhvmconf=hhvmconf)
 
-                data = dict(php="9000", debug="9001", hhvm="8000")
                 Log.debug(self, 'Writting the Nginx debug configration to file'
                           ' /etc/nginx/conf.d/upstream.conf ')
                 ee_nginx = open('/etc/nginx/conf.d/upstream.conf',

ee/core/variables.py

@@ -12,7 +12,7 @@ class EEVariables():
     """Intialization of core variables"""
 
     # EasyEngine version
-    ee_version = "3.2.1"
+    ee_version = "3.2.2"
 
     # 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.1"
+readonly ee_version_new="3.2.2"
 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}')

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