From: Marius Gavrilescu <marius@ieval.ro>
Date: Thu, 13 Feb 2014 20:48:25 +0000 (+0200)
Subject: Merge branch 'master' into mindcoding
X-Git-Url: http://git.ieval.ro/?a=commitdiff_plain;h=42605537962bdbceedb27952a1319ed7e590e896;p=gruntmaster-page.git

Merge branch 'master' into mindcoding

Conflicts:
	run
---

42605537962bdbceedb27952a1319ed7e590e896
diff --cc run
index ac7be6c,fc3bcd0..d5ab8d7
--- a/run
+++ b/run
@@@ -1,5 -1,5 +1,5 @@@
  #!/bin/bash
 -export PURGE_HOST=gm.ieval.ro
 +export PURGE_HOST=mindcoding.ro
  export AAP_ROOTDIR=/var/www/auth/us/
  export PLACK_ENV=deployment
- exec start_server --port=8082 -- plackup -s Starlet -Ilib --keepalive-timeout=100000 --max-reqs-per-child=1000 --max-workers=50
 -exec start_server --port=8081 -- plackup -s Starlet -Ilib -L Delayed
++exec start_server --port=8082 -- plackup -s Starlet -Ilib -L Delayed --keepalive-timeout=100000 --max-reqs-per-child=1000 --max-workers=50