Merge branch 'nginx/1.2.2' into develop

* nginx/1.2.2: Nginx version: 1.2.2.
AntoineGermain · Jul 5, 2012 · cff40f7 · cff40f7
2 parents 48a048a + a3ba71a
commit cff40f7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/bin/compile b/bin/compile
@@ -5,7 +5,7 @@ set -e
 set -o pipefail
 
 # START CONFIG
-NGINX_VERSION=1.2.1
+NGINX_VERSION=1.2.2
 LIBMCRYPT_VERSION=2.5.8
 LIBMEMCACHED_VERSION=1.0.7
 PHP_VERSION=5.4.4

diff --git a/support/set-env.sh b/support/set-env.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-export NGINX_VERSION="1.2.1"
+export NGINX_VERSION="1.2.2"
 export PHP_VERSION="5.4.4"
 export LIBMCRYPT_VERSION="2.5.8"
 export LIBMEMCACHED_VERSION="1.0.7"