Merge 8377:8381 from trunk.

[rails.git] / config / database.yml

diff --git a/config/database.yml b/config/database.yml
index 1fe4d9880030befcca52870dee65ee62f69eb3ed..19b5dd8d5227ae5c04720b61afd9a101661c9cbe 100644 (file)
--- a/config/database.yml
+++ b/config/database.yml
@@ -12,9 +12,8 @@
 #   http://dev.mysql.com/doc/refman/5.0/en/old-client.html
 development:
   adapter: mysql
-  database: openstreetmap
-  username: openstreetmap
-  password: openstreetmap
+  database: osm
+  user: root  
   host: localhost
 
 # Warning: The database defined as 'test' will be erased and
@@ -33,3 +32,4 @@ production:
   username: openstreetmap
   password: openstreetmap
   host: db.openstreetmap.org
+