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 d366bc96b3922ed66c0e3f9037044c99932783ae..3637829537ee6dfd46d20943474ec5b28ae3e859 100644 (file)
--- a/config/database.yml
+++ b/config/database.yml
@@ -13,8 +13,8 @@
 development:
   adapter: mysql
   database: osm
-  username: openstreetmap
-  password: openstreetmap
+  username: osm
+  password: osm
   host: localhost
 
 # Warning: The database defined as 'test' will be erased and
@@ -33,3 +33,4 @@ production:
   username: openstreetmap
   password: openstreetmap
   host: db.openstreetmap.org
+