Commit
1f2f3e4ccbd270dd719fe124c0b060fb77c05ec8
Exists in
master
and in
22 other branches
angular_poc, api-article-archived, article-readonly, backup-7-jan-2016, captcha_serpro_plugin, content-manager-hostspot, export-comment-paragraph, fix_event_date_issue, login-captcha, master_rails3, new_video_plugin, pg_search_rank, production, refactor_with_role, refactor_with_role_scope, remove_profile_cat_icons, resend_confirmation_email, staging, staging_rails3, tasks_keep_filter_params, theme-brasil-digital-from-staging, travis
Merge commit 'refs/merge-requests/196' of git://gitorious.org/noosfero/noosfero …
…into merge-requests/196
|
| @@ -2,7 +2,7 @@ |
| @@ -2,7 +2,7 @@ |
|
2
| pid: tmp/pids/thin.pid |
2
| pid: tmp/pids/thin.pid |
|
3
| address: 127.0.0.1 |
3
| address: 127.0.0.1 |
|
4
| user: noosfero |
4
| user: noosfero |
|
5
| -timeout: 30 |
5
| +timeout: 0 |
|
6
| port: 50000 |
6
| port: 50000 |
|
7
| log: log/thin.log |
7
| log: log/thin.log |
|
8
| max_conns: 1024 |
8
| max_conns: 1024 |
