diff .svn/pristine/ac/ac3cb3eefdd851a5f9d663d9f434eeb017054b9d.svn-base @ 1339:c03a6c3c4db9 luisf

Merge

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/.svn/pristine/ac/ac3cb3eefdd851a5f9d663d9f434eeb017054b9d.svn-base	Thu Jun 20 14:34:42 2013 +0100
@@ -0,0 +1,41 @@
+# Default setup is given for MySQL with ruby1.8. If you're running Redmine
+# with MySQL and ruby1.9, replace the adapter name with `mysql2`.
+# Examples for PostgreSQL and SQLite3 can be found at the end.
+
+production:
+  adapter: mysql
+  database: redmine
+  host: localhost
+  username: root
+  password: ""
+  encoding: utf8
+
+development:
+  adapter: mysql
+  database: redmine_development
+  host: localhost
+  username: root
+  password: ""
+  encoding: utf8
+
+# 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:
+  adapter: mysql
+  database: redmine_test
+  host: localhost
+  username: root
+  password: ""
+  encoding: utf8
+
+test_pgsql:
+  adapter: postgresql
+  database: redmine_test
+  host: localhost
+  username: postgres
+  password: "postgres"
+
+test_sqlite3:
+  adapter: sqlite3
+  database: db/test.sqlite3