Commit
1f2f3e4ccbd270dd719fe124c0b060fb77c05ec8
Exists in
staging
and in
26 other branches
angular_poc, api-article-archived, api-homepage, api_visitor, article-readonly, caching-rails4, captcha_serpro_plugin, comment_paragraph_api, comments_api_reply, content-manager-hostspot, environment-api, export-comment-paragraph, fix_event_date_issue, fix_multitenancy, fix_profile_wall, fix_string_downcase_and_upcase, fix_upload_files_on_development_environment, json_cookie_serializer, login-captcha, master, new_security, new_video_plugin, pg_search_rank, production, resend_confirmation_email, tasks_keep_filter_params
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 |
