split_node_tags: Merge changes in main branch up to r7649.

[rails.git] / config / database.yml

diff --git a/config/database.yml b/config/database.yml
index 436e3d3062eb05280e6c333637ba9c8829b595b7..3637829537ee6dfd46d20943474ec5b28ae3e859 100644 (file)
--- a/config/database.yml
+++ b/config/database.yml
@@ -12,9 +12,9 @@
 #   http://dev.mysql.com/doc/refman/5.0/en/old-client.html
 development:
   adapter: mysql
-  database: openstreetmap
-  username: TheUsername
-  password: ThePassword
+  database: osm
+  username: osm
+  password: osm
   host: localhost
 
 # Warning: The database defined as 'test' will be erased and