]> git.openstreetmap.org Git - rails.git/blobdiff - config/database.yml
Merged 8899:9136 and 9145 from trunk.
[rails.git] / config / database.yml
index 19b5dd8d5227ae5c04720b61afd9a101661c9cbe..b884f3b938fea8c5ea541e0d4af5fbbc16529dd7 100644 (file)
@@ -12,8 +12,9 @@
 #   http://dev.mysql.com/doc/refman/5.0/en/old-client.html
 development:
   adapter: mysql
-  database: osm
-  user: root  
+  database: openstreetmap
+  username: openstreetmap
+  password: openstreetmap
   host: localhost
 
 # Warning: The database defined as 'test' will be erased and