From eafdb61f2f761e14517f6e0e2d8b1319708c7a56 Mon Sep 17 00:00:00 2001 From: ahinz Date: Fri, 12 Dec 2014 10:55:27 +0100 Subject: [PATCH] ` --- config/database.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/config/database.yml b/config/database.yml index 23748c7..c1e4b24 100644 --- a/config/database.yml +++ b/config/database.yml @@ -2,17 +2,14 @@ default: &default adapter: mysql2 encoding: utf8 pool: 5 + timeout: 5000 username: devblog_db password: YT29JEeP4t03ECV - timeout: 5000 - + development: <<: *default database: devblog_dev -# Warning: The database defined as "test" will be erased and -# re-generated from your development database when you run "rake". -# Do not set this db to the same as development or production. test: <<: *default database: devblog_test